浏览代码

采美sku bugfix

zhijiezhao 2 年之前
父节点
当前提交
390225b7ef

+ 4 - 0
src/main/java/com/caimei/modules/product/dao/CmPromotionDao.java

@@ -95,6 +95,10 @@ public interface CmPromotionDao extends CrudDao<CmPromotion> {
     CmPromotion findPromotionsByProductId(@Param("productId") Integer productId);
 
     Double getPresentPriceById(@Param("skuId") Integer skuId);
+
     List<Integer> findProductIdByPromotion(String promotionsId);
+
     List<Integer> findProductIdsByPromotion(String promotionsId);
+
+    void deletePromotion(@Param("id")String id,@Param("skuId") Integer skuId);
 }

+ 4 - 0
src/main/java/com/caimei/modules/product/service/CmPromotionService.java

@@ -348,4 +348,8 @@ public class CmPromotionService extends CrudService<CmPromotionDao, CmPromotion>
     public CmPromotion findProductPromotion(String shopId, Long productId) {
          return cmPromotionDao.findProductPromotion(shopId, productId);
     }
+
+    public void delPromotion(String id, Integer skuId) {
+        cmPromotionDao.deletePromotion(id,skuId);
+    }
 }

+ 19 - 1
src/main/java/com/caimei/modules/product/web/CmPromotionController.java

@@ -1,5 +1,8 @@
 package com.caimei.modules.product.web;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.caimei.modules.bulkpurchase.entity.OrderProduct;
 import com.caimei.modules.bulkpurchase.entity.PurchaseProduct;
 import com.caimei.modules.cibe.entity.Shop;
 import com.caimei.modules.opensearch.CoreServiceUitls;
@@ -116,6 +119,21 @@ public class CmPromotionController extends BaseController {
         }
     }
 
+    @RequestMapping(value = "delPromotion")
+    @ResponseBody
+    public Map<String, Object> delPromotion(@RequestParam("id") String id,@RequestParam("skuId")Integer skuId, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            cmPromotionService.delPromotion(id,skuId);
+            map.put("success", "true");
+            map.put("msg", "删除成功");
+        } catch (Exception e) {
+            map.put("success", "false");
+            map.put("msg", "删除失败");
+        }
+        return map;
+    }
+
     /**
      * 新增/编辑表单回显
      */
@@ -273,7 +291,7 @@ public class CmPromotionController extends BaseController {
                         ListIterator<Product> giftListIterator = giftProduct.listIterator();
                         while (giftListIterator.hasNext()) {
                             Product next = giftListIterator.next();
-                            if (delGiftIdList.contains(next.getProductID().toString())) {
+                            if (delGiftIdList.contains(next.getSkuId().toString())) {
                                 giftListIterator.remove();
                             }
                         }

+ 5 - 0
src/main/resources/mappings/modules/product/CmPromotionMapper.xml

@@ -440,4 +440,9 @@
         from product
         where shopID in (select supplierId from cm_promotions_product where promotionsId = #{promotionsId})
     </select>
+    <delete id="deletePromotion">
+        delete from cm_promotions_gift
+        where promotionsId=#{id}
+        and skuId=#{skuId}
+    </delete>
 </mapper>

+ 1 - 2
src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -87,8 +87,7 @@
 		a.qualificationNo,
 		a.productName,
 		a.qualificationTime,
-		a.qualificationLink,
-        (select price from cm_sku where productId = a.productId order by price asc limit 1) as price
+		a.qualificationLink
 
     </sql>
 

+ 60 - 38
src/main/webapp/WEB-INF/views/modules/product-new/multiPromotionForm.jsp

@@ -66,10 +66,12 @@
                             return false;
                         }
                     }
-                    if (mode=="3" &&  ( ${cmPromotion.giftProducts==null or cmPromotion.giftProducts.size()==0})) {
-                        alertx("请至少选择1个赠送的商品");
-                        isSubMitFlag = false;
-                        return false;
+                    if (mode=="3") {
+                        if(document.getElementById("contentTbody1").rows.length<1){
+                            alertx("请至少选择1个赠送的商品");
+                            isSubMitFlag = false;
+                            return false;
+                        }
                     }
                     //将促销商品和赠品信息填充进数组
                     $('#contentTbody tr').each(function (index, item) {
@@ -95,7 +97,7 @@
                             return false;
                         }
                         var obj = {
-                            productId: $itemProductID,
+                            skuId: $itemProductID,
                             number: $giftNumber
                         };
                         addGiftArray.push(obj)
@@ -225,38 +227,56 @@
             });
         }
 
-        function deleteProduct(obj, storeStatus,type) {
+        function deleteProduct(obj,type) {
             //将该行数据取消勾选,若存在数据库中则将其存入delProductIds中
             $(".check-item[value=" + obj + "]").prop("checked", false);
-            var delProductIds = $("#delProductIds").val();
-            var delGiftIds = $("#delGiftIds").val();
-            if (storeStatus && type == 1) {
-                if (delProductIds != '') {
-                    delProductIds = delProductIds + "," + obj;
-                }else delProductIds = obj;
+            if (type == 1) {
+                var product=$('#product'+obj);
+                $(product).remove();
             }
-            if (storeStatus && type == 2) {
-                if (delGiftIds != '') {
-                    delGiftIds = delGiftIds + "," + obj;
-                }else delGiftIds = obj;
+            if (type == 2) {
+                var gift= $('#gift'+obj);
+                $(gift).remove();
             }
-            window.setTimeout(function () {
-                var productItems = getCheckedItems(1);
-                var giftItems = getCheckedItems(2);
-                var mode = $("input[name='mode']:checked").val();
-                var reducedPrice = $("#reducedPrice").val();
-                var touchPrice2 = $("#touchPrice2").val();
-                var touchPrice3 = $("#touchPrice3").val();
-                var status = $("input[name='status']:checked").val();
-                var beginTime = $("#beginTime").val();
-                var endTime = $("#endTime").val();
-                var delFlag1 = $("input[name='delFlag1']:checked").val();
-                var description = $("#description").val();
-                window.location.href = "${ctx}/product/cmPromotions/form?type=2&productIds=" + productItems + "&giftIds=" + giftItems +
-                    "&delProductIds="+delProductIds+"&delGiftIds="+delGiftIds+"&mode=" + mode + "&description=" +description+
-                    "&reducedPrice=" + reducedPrice  + "&touchPrice2=" + touchPrice2 + "&touchPrice3=" + touchPrice3 +
-                    "&status=" + status + "&beginTime=" + beginTime + "&endTime=" + endTime + "&delFlag1=" + delFlag1 + "&id=${cmPromotion.id}";
-            },100)
+
+            $.ajax({
+                url: "${ctx}/product/cmPromotions/delPromotion",
+                data: {"id":${cmPromotion.id},"skuId":obj},
+                type: "POST",
+                async: false,
+                success: function(data){
+                    flag=data.success;
+                }
+            });
+            <%--var delProductIds = $("#delProductIds").val();--%>
+            <%--var delGiftIds = $("#delGiftIds").val();--%>
+            <%--if (storeStatus && type == 1) {--%>
+            <%--    if (delProductIds != '') {--%>
+            <%--        delProductIds = delProductIds + "," + obj;--%>
+            <%--    }else delProductIds = obj;--%>
+            <%--}--%>
+            <%--if (storeStatus && type == 2) {--%>
+            <%--    if (delGiftIds != '') {--%>
+            <%--        delGiftIds = delGiftIds + "," + obj;--%>
+            <%--    }else delGiftIds = obj;--%>
+            <%--}--%>
+            <%--window.setTimeout(function () {--%>
+            <%--    var productItems = getCheckedItems(1);--%>
+            <%--    var giftItems = getCheckedItems(2);--%>
+            <%--    var mode = $("input[name='mode']:checked").val();--%>
+            <%--    var reducedPrice = $("#reducedPrice").val();--%>
+            <%--    var touchPrice2 = $("#touchPrice2").val();--%>
+            <%--    var touchPrice3 = $("#touchPrice3").val();--%>
+            <%--    var status = $("input[name='status']:checked").val();--%>
+            <%--    var beginTime = $("#beginTime").val();--%>
+            <%--    var endTime = $("#endTime").val();--%>
+            <%--    var delFlag1 = $("input[name='delFlag1']:checked").val();--%>
+            <%--    var description = $("#description").val();--%>
+            <%--    window.location.href = "${ctx}/product/cmPromotions/form?type=2&productIds=" + productItems + "&giftIds=" + giftItems +--%>
+            <%--        "&delProductIds="+delProductIds+"&delGiftIds="+delGiftIds+"&mode=" + mode + "&description=" +description+--%>
+            <%--        "&reducedPrice=" + reducedPrice  + "&touchPrice2=" + touchPrice2 + "&touchPrice3=" + touchPrice3 +--%>
+            <%--        "&status=" + status + "&beginTime=" + beginTime + "&endTime=" + endTime + "&delFlag1=" + delFlag1 + "&id=${cmPromotion.id}";--%>
+            <%--},100)--%>
         }
 
         function getCheckedItems(type) {
@@ -302,7 +322,7 @@
                 </thead>
                 <tbody id="contentTbody">
                 <c:forEach items="${cmPromotion.promotionProducts}" var="product">
-                    <tr>
+                    <tr id="product${product.productID}">
                         <th class="hide"><input class="check-item" type="checkbox" id="productCheckItem"
                                    name="info" ${product.storeStatus?'':'checked'}
                                    value='${product.productID}'/></th>
@@ -312,7 +332,7 @@
                         <td>${product.price}</td>
                         <td>
                             <a href="javaScript:;"
-                               onclick="deleteProduct('${product.productID}',${product.storeStatus},1)">删除</a>
+                               onclick="deleteProduct('${product.productID}',1)">删除</a>
                         </td>
                     </tr>
                 </c:forEach>
@@ -346,6 +366,7 @@
                     <th style="width:20px;" class="hide"></th>
                     <th></th>
                     <th>商品图片</th>
+                    <th>skuId</th>
                     <th>商品名称</th>
                     <th>供应商</th>
                     <th>数量</th>
@@ -353,19 +374,20 @@
                     </thead>
                     <tbody id="contentTbody1">
                     <c:forEach items="${cmPromotion.giftProducts}" var="product">
-                        <tr>
+                        <tr id="gift${product.skuId}">
                             <td>赠</td>
                             <th class="hide"><input class="check-item" type="checkbox" id="giftCheckItem"
                                                     name="gift" ${product.storeStatus?'':'checked'}
-                                                    value='${product.productID}'/></th>
+                                                    value='${product.skuId}'/></th>
                             <td><img src="${product.mainImage}" width="50px" height="50px"></td>
+                            <td>${product.skuId}</td>
                             <td>${product.name}</td>
                             <td>${product.shopName}</td>
                             <td><input id="actPrice1" name="giftNumber" style="width:50px;"
                                        value="${product.giftNumber}" type="number" maxlength="7" step="1"></td>
                             <td>
                                 <a href="javaScript:;"
-                                   onclick="deleteProduct('${product.productID}',${product.storeStatus},2)">删除</a>
+                                   onclick="deleteProduct('${product.skuId}',2)">删除</a>
                             </td>
                         </tr>
                     </c:forEach>

+ 59 - 39
src/main/webapp/WEB-INF/views/modules/product-new/shopPromotionForm.jsp

@@ -90,7 +90,7 @@
                             return false;
                         }
                         var obj = {
-                            productId: $itemProductID,
+                            skuId: $itemProductID,
                             number: $giftNumber
                         };
                         addGiftArray.push(obj)
@@ -220,43 +220,61 @@
             });
         }
 
-        function deleteProduct(obj, storeStatus,type) {
+        function deleteProduct(obj, type) {
             //将该行数据取消勾选,若存在数据库中则将其删除
             $(".check-item[value=" + obj + "]").prop("checked", false);
-            var delShopIds = $("#delShopIds").val();
-            var delGiftIds = $("#delGiftIds").val();
-            if (storeStatus && type == 1) {
-                if (delProductIds != '') {
-                    delProductIds = delProductIds + "," + obj;
-                }else delProductIds = obj;
-            }
-            if (storeStatus && type == 2) {
-                if (delGiftIds != '') {
-                    delGiftIds = delGiftIds + "," + obj;
-                }else delGiftIds = obj;
+            if (type == 3) {
+                var shop=$('#shop'+obj);
+                $(shop).remove();
             }
-            if (storeStatus && type == 3) {
-                if (delShopIds != '') {
-                    delShopIds = delShopIds + "," + obj;
-                }else delShopIds = obj;
+            if (type == 2) {
+                var gift= $('#gift'+obj);
+                $(gift).remove();
             }
-            window.setTimeout(function () {
-                var productItems = getCheckedItems(1);
-                var giftItems = getCheckedItems(2);
-                var mode = $("input[name='mode']:checked").val();
-                var reducedPrice = $("#reducedPrice").val();
-                var touchPrice2 = $("#touchPrice2").val();
-                var touchPrice3 = $("#touchPrice3").val();
-                var status = $("input[name='status']:checked").val();
-                var beginTime = $("#beginTime").val();
-                var endTime = $("#endTime").val();
-                var delFlag1 = $("input[name='delFlag1']:checked").val();
-                window.location.href = "${ctx}/product/cmPromotions/form?type=3&shopIds=" + productItems + "&giftIds=" + giftItems +
-                    "&delShopIds="+delShopIds+"&delGiftIds="+delGiftIds+ "&mode=" + mode +
-                    "&reducedPrice=" + reducedPrice  + "&touchPrice2=" + touchPrice2 + "&touchPrice3=" + touchPrice3 +
-                    "&status=" + status + "&beginTime=" + beginTime + "&endTime=" + endTime + "&delFlag1=" + delFlag1 + "&id=${cmPromotion.id}"+
-                    "&searchDbFlag=0";
-            },100)
+
+            $.ajax({
+                url: "${ctx}/product/cmPromotions/delPromotion",
+                data: {"id":${cmPromotion.id},"skuId":obj},
+                type: "POST",
+                async: false,
+                success: function(data){
+                    flag=data.success;
+                }
+            });
+            <%--var delShopIds = $("#delShopIds").val();--%>
+            <%--var delGiftIds = $("#delGiftIds").val();--%>
+            <%--if (storeStatus && type == 1) {--%>
+            <%--    if (delProductIds != '') {--%>
+            <%--        delProductIds = delProductIds + "," + obj;--%>
+            <%--    }else delProductIds = obj;--%>
+            <%--}--%>
+            <%--if (storeStatus && type == 2) {--%>
+            <%--    if (delGiftIds != '') {--%>
+            <%--        delGiftIds = delGiftIds + "," + obj;--%>
+            <%--    }else delGiftIds = obj;--%>
+            <%--}--%>
+            <%--if (storeStatus && type == 3) {--%>
+            <%--    if (delShopIds != '') {--%>
+            <%--        delShopIds = delShopIds + "," + obj;--%>
+            <%--    }else delShopIds = obj;--%>
+            <%--}--%>
+            <%--window.setTimeout(function () {--%>
+            <%--    var productItems = getCheckedItems(1);--%>
+            <%--    var giftItems = getCheckedItems(2);--%>
+            <%--    var mode = $("input[name='mode']:checked").val();--%>
+            <%--    var reducedPrice = $("#reducedPrice").val();--%>
+            <%--    var touchPrice2 = $("#touchPrice2").val();--%>
+            <%--    var touchPrice3 = $("#touchPrice3").val();--%>
+            <%--    var status = $("input[name='status']:checked").val();--%>
+            <%--    var beginTime = $("#beginTime").val();--%>
+            <%--    var endTime = $("#endTime").val();--%>
+            <%--    var delFlag1 = $("input[name='delFlag1']:checked").val();--%>
+            <%--    window.location.href = "${ctx}/product/cmPromotions/form?type=3&shopIds=" + productItems + "&giftIds=" + giftItems +--%>
+            <%--        "&delShopIds="+delShopIds+"&delGiftIds="+delGiftIds+ "&mode=" + mode +--%>
+            <%--        "&reducedPrice=" + reducedPrice  + "&touchPrice2=" + touchPrice2 + "&touchPrice3=" + touchPrice3 +--%>
+            <%--        "&status=" + status + "&beginTime=" + beginTime + "&endTime=" + endTime + "&delFlag1=" + delFlag1 + "&id=${cmPromotion.id}"+--%>
+            <%--        "&searchDbFlag=0";--%>
+            <%--},100)--%>
         }
 
         function getCheckedItems(type) {
@@ -299,7 +317,7 @@
                 </thead>
                 <tbody id="contentTbody">
                 <c:forEach items="${cmPromotion.promotionShops}" var="shop">
-                    <tr>
+                    <tr id="shop${shop.shopID}">
                         <th class="hide"><input class="check-item" type="checkbox" id="productCheckItem"
                                    name="info" ${shop.storeStatus?'':'checked'}
                                    value='${shop.shopID}'/></th>
@@ -309,7 +327,7 @@
                         <td>${shop.contractMobile}</td>
                         <td>
                             <a href="javaScript:;"
-                               onclick="deleteProduct('${shop.shopID}',${shop.storeStatus},3)">删除</a>
+                               onclick="deleteProduct('${shop.shopID}',3)">删除</a>
                         </td>
                     </tr>
                 </c:forEach>
@@ -343,6 +361,7 @@
                     <th style="width:20px;" class="hide"></th>
                     <th></th>
                     <th>商品图片</th>
+                    <th>skuId</th>
                     <th>商品名称</th>
                     <th>供应商</th>
                     <th>数量</th>
@@ -350,19 +369,20 @@
                     </thead>
                     <tbody id="contentTbody1">
                     <c:forEach items="${cmPromotion.giftProducts}" var="product">
-                        <tr>
+                        <tr id="gift${product.skuId}">
                             <td>赠</td>
                             <th class="hide"><input class="check-item" type="checkbox" id="giftCheckItem"
                                                     name="gift" ${product.storeStatus?'':'checked'}
-                                                    value='${product.productID}'/></th>
+                                                    value='${product.skuId}'/></th>
                             <td><img src="${product.mainImage}" width="50px" height="50px"></td>
+                            <td>${product.skuId}</td>
                             <td>${product.name}</td>
                             <td>${product.shopName}</td>
                             <td><input id="actPrice1" name="giftNumber" style="width:50px;"
                                        value="${product.giftNumber}" type="number" maxlength="7" step="1"></td>
                             <td>
                                 <a href="javaScript:;"
-                                   onclick="deleteProduct('${product.productID}',${product.storeStatus},2)">删除</a>
+                                   onclick="deleteProduct('${product.skuId}',2)">删除</a>
                             </td>
                         </tr>
                     </c:forEach>

+ 46 - 37
src/main/webapp/WEB-INF/views/modules/product-new/singlePromotionForm.jsp

@@ -95,10 +95,12 @@
                             }
                         }
                     }
-                    if (mode=="3" &&( ${cmPromotion.giftProducts==null or cmPromotion.giftProducts.size()==0})) {
-                        alertx("请至少选择1个赠送的商品");
-                        isSubMitFlag = false;
-                        return false;
+                    if (mode=="3") {
+                        if(document.getElementById("contentTbody1").rows.length<1){
+                            alertx("请至少选择1个赠送的商品");
+                            isSubMitFlag = false;
+                            return false;
+                        }
                     }
                     //将促销商品和赠品信息填充进数组
                     $('#contentTbody tr').each(function (index, item) {
@@ -256,39 +258,46 @@
             });
         }
 
-        function deleteProduct(obj, storeStatus,type) {
+        function deleteProduct(obj,type) {
             //将该行数据取消勾选,若存在数据库中则将其删除
             $(".check-item[value=" + obj + "]").prop("checked", false);
-            var delProductIds = $("#delProductIds").val();
-            var delGiftIds = $("#delGiftIds").val();
-            if (storeStatus && type == 1) {
-                if (delProductIds != '') {
-                    delProductIds = delProductIds + "," + obj;
-                }else delProductIds = obj;
+            if (type == 1) {
+                var product=$('#product'+obj);
+                $(product).remove();
             }
-            if (storeStatus && type == 2) {
-                if (delGiftIds != '') {
-                    delGiftIds = delGiftIds + "," + obj;
-                }else delGiftIds = obj;
+            if (type == 2) {
+                var gift= $('#gift'+obj);
+                $(gift).remove();
             }
-            window.setTimeout(function () {
-                var productItems = getCheckedItems(1);
-                var giftItems = getCheckedItems(2);
-                var mode = $("input[name='mode']:checked").val();
-                var reducedPrice = $("#reducedPrice").val();
-                var touchPrice1 = $("#touchPrice1").val();
-                var touchPrice2 = $("#touchPrice2").val();
-                var touchPrice3 = $("#touchPrice3").val();
-                var status = $("input[name='status']:checked").val();
-                var beginTime = $("#beginTime").val();
-                var endTime = $("#endTime").val();
-                var delFlag1 = $("input[name='delFlag1']:checked").val();
-                window.location.href = "${ctx}/product/cmPromotions/form?type=1&productIds=" + productItems + "&giftIds=" + giftItems +
-                    "&delProductIds="+delProductIds+"&delGiftIds="+delGiftIds+ "&mode=" + mode +
-                    "&reducedPrice=" + reducedPrice + "&touchPrice1=" + touchPrice1 + "&touchPrice2=" + touchPrice2 + "&touchPrice3=" + touchPrice3 +
-                    "&status=" + status + "&beginTime=" + beginTime + "&endTime=" + endTime + "&delFlag1=" + delFlag1 + "&id=${cmPromotion.id}" +
-                    "&searchDbFlag=0";
-            },100)
+
+            $.ajax({
+                url: "${ctx}/product/cmPromotions/delPromotion",
+                data: {"id":${cmPromotion.id},"skuId":obj},
+                type: "POST",
+                async: false,
+                success: function(data){
+                    flag=data.success;
+                }
+            });
+
+            <%--window.setTimeout(function () {--%>
+            <%--    var productItems = getCheckedItems(1);--%>
+            <%--    var giftItems = getCheckedItems(2);--%>
+            <%--    var mode = $("input[name='mode']:checked").val();--%>
+            <%--    var reducedPrice = $("#reducedPrice").val();--%>
+            <%--    var touchPrice1 = $("#touchPrice1").val();--%>
+            <%--    var touchPrice2 = $("#touchPrice2").val();--%>
+            <%--    var touchPrice3 = $("#touchPrice3").val();--%>
+            <%--    var status = $("input[name='status']:checked").val();--%>
+            <%--    var beginTime = $("#beginTime").val();--%>
+            <%--    var endTime = $("#endTime").val();--%>
+            <%--    var delFlag1 = $("input[name='delFlag1']:checked").val();--%>
+            <%--    window.location.href = "${ctx}/product/cmPromotions/form?type=1&productIds=" + productItems + "&giftIds=" + giftItems +--%>
+            <%--        "&delProductIds="+delProductIds+"&delGiftIds="+delGiftIds+ "&mode=" + mode +--%>
+            <%--        "&reducedPrice=" + reducedPrice + "&touchPrice1=" + touchPrice1 + "&touchPrice2=" + touchPrice2 + "&touchPrice3=" + touchPrice3 +--%>
+            <%--        "&status=" + status + "&beginTime=" + beginTime + "&endTime=" + endTime + "&delFlag1=" + delFlag1 + "&id=${cmPromotion.id}" +--%>
+            <%--        "&searchDbFlag=0";--%>
+            <%--},100)--%>
         }
 
         function getCheckedItems(type) {
@@ -340,7 +349,7 @@
                 </thead>
                 <tbody id="contentTbody">
                 <c:forEach items="${cmPromotion.promotionProducts}" var="product">
-                    <tr>
+                    <tr id="product${product.productID}">
                         <th class="hide"><input class="check-item" type="checkbox" id="productCheckItem"
                                    name="info" ${product.storeStatus?'':'checked'}
                                    value='${product.productID}'/></th>
@@ -350,7 +359,7 @@
                         <td>${product.price}</td>
                         <td>
                             <a href="javaScript:;"
-                               onclick="deleteProduct('${product.productID}',${product.storeStatus},1)">删除</a>
+                               onclick="deleteProduct('${product.productID}',1)">删除</a>
                         </td>
                     </tr>
                 </c:forEach>
@@ -397,7 +406,7 @@
                     </thead>
                     <tbody id="contentTbody1">
                     <c:forEach items="${cmPromotion.giftProducts}" var="product">
-                        <tr>
+                        <tr id="gift${product.skuId}">
                             <td>赠</td>
                             <td>${product.skuId}</td>
                             <th class="hide"><input class="check-item" type="checkbox" id="giftCheckItem"
@@ -411,7 +420,7 @@
                                        value="${product.giftNumber}" type="number" maxlength="7" step="1"></td>
                             <td>
                                 <a href="javaScript:;"
-                                   onclick="deleteProduct('${product.productID}',${product.storeStatus},2)">删除</a>
+                                   onclick="deleteProduct('${product.skuId}',2)">删除</a>
                             </td>
                         </tr>
                     </c:forEach>

+ 5 - 5
src/main/webapp/static/modules/bulkpurchase/orderForm.js

@@ -638,11 +638,11 @@ function resetProductList(setData, ind) {
         });
     } else {
         debugger;
-        if(ind){
-            productList.forEach(function (data) {
-                setProductList(data, false);
-            });
-        }
+        // if(ind){
+        //     productList.forEach(function (data) {
+        //         setProductList(data, false);
+        //     });
+        // }
 
         var skuId;
         if (setData.skuStr) {