促销订单以促销方案中的商品上下架为准

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

@@ -258,13 +258,16 @@ public class Order extends Controller {
         JSONArray items = content.getJSONArray("items");
         ArrayList<Long> itemidids = new ArrayList();
         ArrayList<Long> sa_shoppingcartids = new ArrayList();
-
+        String type = content.getStringValue("type", false, "标准订单");
         OrderItemsHelper orderItemsHelper = new OrderItemsHelper(this);
         //判断是否是同一个品牌的商品
         for (Object obj : items) {
             JSONObject item = (JSONObject) obj;
-            orderItemsHelper.checkOffOrderItems("plm_item", item.getLongValue("itemid"));
-            orderItemsHelper.checkOffOrderItems("sa_promotion_items", item.getLongValue("itemid"));
+            if(type.equals("促销订单")) {
+                orderItemsHelper.checkOffOrderItems("sa_promotion_items", item.getLongValue("itemid"));
+            }else {
+                orderItemsHelper.checkOffOrderItems("plm_item", item.getLongValue("itemid"));
+            }
 
             Long temp_sa_brandid = item.getLongValue("sa_brandid");
             itemidids.add(item.getLongValue("itemid"));
@@ -291,7 +294,6 @@ public class Order extends Controller {
 
         //表名
         String tableName = "sa_order";
-        String type = content.getStringValue("type", false, "标准订单");
         //类型为标准订单时查询默认框架合同信息
         Long sa_contractid = 0L;
         Long sa_projectid = 0L;