经销商端：促销活动，已售罄的商品禁止加入活动购物车

src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -85,14 +85,11 @@ public class OrderItems extends Controller {
             sumqty = sumqty.add(qty);
 
 
-            if (dbConnect.runSqlQuery("SELECT 1 from sa_orderitems WHERE itemid=" + itemid + " and sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'").isEmpty()) {
-                continue;
-            }
+
 
             //商品信息
             Row itemRow = getItemRow(itemid);
-            //是否符合商品起订量和增量判断
-            orderItemsHelper.compareQty(type, itemRowsMap, item, itemRow, promotionitems);
+
 
             BigDecimal price1 = new BigDecimal(0);
 //            SQLFactory sqlFactory = new SQLFactory(this, "订单商品明细_新增");
@@ -130,6 +127,14 @@ public class OrderItems extends Controller {
                 }
                 isInsert = false;
             }
+            if(!isInsert){
+                if (dbConnect.runSqlQuery("SELECT 1 from sa_orderitems WHERE itemid=" + itemid + " and sa_orderid=" + sa_orderid + " and siteid='" + siteid + "'").isEmpty()) {
+                    continue;
+                }
+            }
+
+            //是否符合商品起订量和增量判断
+            orderItemsHelper.compareQty(type, itemRowsMap, item, itemRow, promotionitems);
 
             BigDecimal defaultprice;
             BigDecimal price;