bugfix

src/main/java/com/caimei/modules/product/service/CmPromotionService.java

@@ -349,6 +349,7 @@ public class CmPromotionService extends CrudService<CmPromotionDao, CmPromotion>
                 //赠品改为skuId
                 String giftId = (String) map.get("skuId");
                 Integer number = Integer.parseInt(map.get("number").toString());
+                logger.info("giftId------------------" + giftId);
                 cmPromotionDao.insertGiftProduct(promotionId, giftId, number);
             }
         }

src/main/java/com/caimei/modules/product/web/CmPromotionController.java

@@ -183,11 +183,20 @@ public class CmPromotionController extends BaseController {
                     String[] split = cmPromotion.getProductIds().split(",");
                     for (String productId : split) {
                         if (StringUtil.isNotBlank(productId)) {
+                            if(StringUtils.isNotBlank(cmPromotion.getType()) && "2".equals(cmPromotion.getType())){
+                                //凑单促销的时候取的是skuId
+                                productId=productService.getProductIdBySku(productId);
+                            }
                             Product product = productService.get(productId);
                             promotionProducts.add(product);
                         }
                     }
                 } else {
+                    if(StringUtils.isNotBlank(cmPromotion.getType()) && "2".equals(cmPromotion.getType())){
+                        //凑单促销的时候取的是skuId
+                        String productId=productService.getProductIdBySku(cmPromotion.getProductIds());
+                        cmPromotion.setProductIds(productId);
+                    }
                     Product product = productService.get(cmPromotion.getProductIds());
                     promotionProducts.add(product);
                 }

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

@@ -242,6 +242,16 @@
                 $("#delProductIds").val(delProductIds);
                 var product = $('#product' + obj);
                 $(product).remove();
+                var productIds = '';
+                $('#contentTbody tr').each(function (index, item) {
+                    var $this = $(this);
+                    var $itemProductID = $this.find('input[name="info"]').val();
+                    productIds += $itemProductID + ',';
+                });
+                $("#productIds").val(productIds);
+                if ($('#contentTbody tr').size < 1) {
+                    $("#productIds").val('');
+                }
             }
             if (2 === type) {
                 if (delGiftIds != '') {
@@ -252,6 +262,16 @@
                 $("#delGiftIds").val(delGiftIds);
                 var gift = $('#gift' + obj);
                 $(gift).remove();
+                var showSelectProductID = '';
+                $('#contentTbody1 tr').each(function (index, item) {
+                    var $this = $(this);
+                    var $itemProductID = $this.find('input[name="gift"]').val();
+                    showSelectProductID += $itemProductID + ',';
+                });
+                $("#giftIds").val(showSelectProductID);
+                if ($('#contentTbody1 tr').size < 1) {
+                    $("#giftIds").val('');
+                }
             }
 
             <%--$.ajax({--%>

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

@@ -241,6 +241,16 @@
                 $("#delProductIds").val(delProductIds);
                 var shop = $('#shop' + obj);
                 $(shop).remove();
+                var shopIds = '';
+                $('#contentTbody tr').each(function (index, item) {
+                    var $this = $(this);
+                    var $itemProductID = $this.find('input[name="info"]').val();
+                    shopIds += $itemProductID + ',';
+                });
+                $("#shopIds").val(shopIds);
+                if ($('#contentTbody tr').size < 1) {
+                    $("#shopIds").val('');
+                }
             }
             if (2 === type) {
                 if (delGiftIds != '') {
@@ -251,6 +261,16 @@
                 $("#delGiftIds").val(delGiftIds);
                 var gift = $('#gift' + obj);
                 $(gift).remove();
+                $('#contentTbody1 tr').each(function (index, item) {
+                    var $this = $(this);
+                    var $itemProductID = $this.find('input[name="gift"]').val();
+                    showSelectProductID += $itemProductID + ',';
+                });
+                $("#giftIds").val(showSelectProductID);
+                var showSelectProductID = '';
+                if ($('#contentTbody1 tr').size < 1) {
+                    $("#giftIds").val('');
+                }
             }
 
 

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

@@ -280,6 +280,16 @@
                 $("#delProductIds").val(delProductIds);
                 var product = $('#product' + obj);
                 $(product).remove();
+                var productIds = '';
+                $('#contentTbody tr').each(function (index, item) {
+                    var $this = $(this);
+                    var $itemProductID = $this.find('input[name="info"]').val();
+                    productIds += $itemProductID + ',';
+                });
+                $("#productIds").val(productIds);
+                if ($('#contentTbody tr').size < 1) {
+                    $("#productIds").val('');
+                }
             } else if (2 === type) {
                 if (delGiftIds != '') {
                     delGiftIds = delGiftIds + "," + obj;
@@ -289,6 +299,16 @@
                 $("#delGiftIds").val(delGiftIds);
                 var gift = $('#gift' + obj);
                 $(gift).remove();
+                var showSelectProductID = '';
+                $('#contentTbody1 tr').each(function (index, item) {
+                    var $this = $(this);
+                    var $itemProductID = $this.find('input[name="gift"]').val();
+                    showSelectProductID += $itemProductID + ',';
+                });
+                $("#giftIds").val(showSelectProductID);
+                if ($('#contentTbody1 tr').size < 1) {
+                    $("#giftIds").val('');
+                }
             }
 
 
@@ -465,7 +485,7 @@
                             <td>${product.skuId}</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.name}</td>
                             <td>${product.unit}</td>