Преглед на файлове

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

eganwu преди 2 години
родител
ревизия
904646fb04
променени са 1 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 7 1
      src/custom/restcontroller/webmanage/sale/order/OrderItems.java

+ 7 - 1
src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -83,6 +83,12 @@ public class OrderItems extends Controller {
             Long sa_orderitemsid = item.getLong("sa_orderitemsid");
             Long sa_orderitemsid = item.getLong("sa_orderitemsid");
             BigDecimal qty = item.getBigDecimalValue("qty");
             BigDecimal qty = item.getBigDecimalValue("qty");
             sumqty = sumqty.add(qty);
             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);
             Row itemRow = getItemRow(itemid);
             //是否符合商品起订量和增量判断
             //是否符合商品起订量和增量判断
@@ -217,7 +223,7 @@ public class OrderItems extends Controller {
             JSONArray customproperties = new JSONArray();
             JSONArray customproperties = new JSONArray();
             customproperties = orderItemsHelper.getCustomProperties(itemRowsMap, item);
             customproperties = orderItemsHelper.getCustomProperties(itemRowsMap, item);
 
 
-            String custompropertie=customproperties.toJSONString().replace("[", "").replace("]", "").replace("\"", "");
+            String custompropertie = customproperties.toJSONString().replace("[", "").replace("]", "").replace("\"", "");
 
 
             Rows temprows = dbConnect.runSqlQuery("SELECT itemname from  sa_orderitems WHERE sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and itemid=" + itemid + " and ifnull(customproperties,'')='" + custompropertie + "'");
             Rows temprows = dbConnect.runSqlQuery("SELECT itemname from  sa_orderitems WHERE sa_orderid=" + sa_orderid + " and siteid='" + siteid + "' and itemid=" + itemid + " and ifnull(customproperties,'')='" + custompropertie + "'");
             rows.addAll(temprows);
             rows.addAll(temprows);