Merge remote-tracking branch 'origin/developer' into developerD

src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -292,12 +292,22 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                         p.setDiscountPrice(MathUtil.div(p.getDiscountPrice(), MathUtil.div(MathUtil.add(p.getTaxRate(), 100), 100)).doubleValue());
                     }*/
                     // 付采美总金额
-                    allServeAmount = MathUtil.add(allServeAmount, MathUtil.mul(p.getNum(), p.getCmCostPrice())).doubleValue();
+                    allServeAmount = MathUtil.add(allServeAmount, MathUtil.mul(MathUtil.sub(p.getNum(),p.getReturnedNum()), p.getCmCostPrice())).doubleValue();
                     // 子订单利润
-                    if (p.getProductType() == 0) {
-                        brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), p.getNum())).doubleValue();
-                    } else {
+                    if (p.getReturnedNum().equals(p.getNum())) {
                         brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                    } else if (p.getReturnedNum() < p.getNum()) {
+                        if (p.getProductType() == 0) {
+                            brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), MathUtil.sub(p.getNum(), p.getReturnedNum()))).doubleValue();
+                        } else {
+                            brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                        }
+                    } else {
+                        if (p.getProductType() == 0) {
+                            brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), p.getNum())).doubleValue();
+                        } else {
+                            brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                        }
                     }
                 }
                 so.setBrokerage(brokerage);
@@ -451,11 +461,22 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                         p.setDiscountPrice(MathUtil.div(p.getDiscountPrice(), MathUtil.div(MathUtil.add(p.getTaxRate(), 100), 100)).doubleValue());
                     }*/
                     // 付采美总金额
-                    allServeAmount = MathUtil.add(allServeAmount, MathUtil.mul(p.getNum(), p.getCmCostPrice())).doubleValue();
-                    if (p.getProductType() == 0) {
-                        brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), p.getNum())).doubleValue();
-                    } else {
+                    allServeAmount = MathUtil.add(allServeAmount, MathUtil.mul(MathUtil.sub(p.getNum(),p.getReturnedNum()), p.getCmCostPrice())).doubleValue();
+                    // 子订单利润
+                    if (p.getReturnedNum().equals(p.getNum())) {
                         brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                    } else if (p.getReturnedNum() < p.getNum()) {
+                        if (p.getProductType() == 0) {
+                            brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), MathUtil.sub(p.getNum(), p.getReturnedNum()))).doubleValue();
+                        } else {
+                            brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                        }
+                    } else {
+                        if (p.getProductType() == 0) {
+                            brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), p.getNum())).doubleValue();
+                        } else {
+                            brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                        }
                     }
                 }
                 so.setBrokerage(brokerage);

src/main/java/com/caimei/modules/order/service/CmRefundShopService.java

@@ -186,10 +186,20 @@ public class CmRefundShopService extends CrudService<CmRefundShopDao, CmRefundSh
                     returnNum = returnNum == null ? 0 : returnNum;
                     p.setReturnedNum(returnNum);
                     // 子订单利润
-                    if (p.getProductType() == 0) {
-                        brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), p.getNum())).doubleValue();
-                    } else {
+                    if (p.getReturnedNum().equals(p.getNum())) {
                         brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                    } else if (p.getReturnedNum() < p.getNum()) {
+                        if (p.getProductType() == 0) {
+                            brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), MathUtil.sub(p.getNum(), p.getReturnedNum()))).doubleValue();
+                        } else {
+                            brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                        }
+                    } else {
+                        if (p.getProductType() == 0) {
+                            brokerage = MathUtil.add(brokerage, MathUtil.mul(p.getBrokerage(), p.getNum())).doubleValue();
+                        } else {
+                            brokerage = MathUtil.add(brokerage, 0).doubleValue();
+                        }
                     }
                 }
                 so.setBrokerage(brokerage);
@@ -247,7 +257,9 @@ public class CmRefundShopService extends CrudService<CmRefundShopDao, CmRefundSh
                 so.setReceiptTotalFee(receiptTotalFee);
                 // 获取抹平金额
                 CmPayShopRecord PayedRecord = cmRefundShopRecordDao.getPayedRecordByShopOrderId(so.getShopOrderID());
-                so.setWipePayment(PayedRecord.getWipePayment());
+                if (null != PayedRecord) {
+                    so.setWipePayment(PayedRecord.getWipePayment());
+                }
 
                 CmRefundShopRecord record = refundRecord.stream().filter(r -> r.getShopOrderID().equals(so.getShopOrderID().toString())).findAny().get();
                 List<NewOrderProduct> orderProductList = newOrderProductDao.findByShopOrderID(so.getShopOrderID());

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1454,13 +1454,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                      * （3）来自采美平台的第三方供应商的线下转账账号为空或者为采美账号的子订单
                      * （4）商品分账号是采美信息的商品的子订单（走了线上支付才排除）
                      */
-                    if ((1161 != shopOrder.getShopID() || 2 != shopOrder.getOrderType() || !flag ||
-                            (!"E1807059160".equals(shopOrder.getSplitCode()) &&  null != discernPayWay && 1 == discernPayWay))) {
-                        // 线下支付的订单
-                        if (null != discernPayWay && 1 != discernPayWay) {
-                            // 订单下线收款， 付款状态与收款状态同步显示
-                            shopOrder.setPayStatus(shopOrder.getReceiptStatus());
-                        }
+                    if ((1161 != shopOrder.getShopID() && 2 != shopOrder.getOrderType() && !flag &&
+                            (!"E1807059160".equals(shopOrder.getSplitCode()) && null != discernPayWay && 1 != discernPayWay))) {
+                                // 订单下线收款， 付款状态与收款状态同步显示
+                                shopOrder.setPayStatus(shopOrder.getReceiptStatus());
                     }
                     // 订单已收款才会出现抹平或者多收退余额，（已收再退款或者撤销退款订单即使存在抹平也需要当未抹平重新计算付款）
                     String receiptStatus = shopOrder.getReceiptStatus();
@@ -1653,7 +1650,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         Double balancePayFee = order.getNewShopOrders().get(0).getAccountAmount();
         //修改子订单状态（余额抵扣）
         if (order.getNewShopOrders().get(0).getUseBalanceFlag() !=null&&order.getNewShopOrders().get(0).getUseBalanceFlag() == 1) {
-            if ( balancePayFee != null && balancePayFee ==order.getNewShopOrders().get(0).getRealPay()) {
+            if ( balancePayFee != null && balancePayFee .equals(order.getNewShopOrders().get(0).getRealPay())) {
                 order.getNewShopOrders().get(0).setReceiptStatus("3");
             } else if ( balancePayFee != null && balancePayFee <order.getNewShopOrders().get(0).getRealPay()) {
                 order.getNewShopOrders().get(0).setReceiptStatus("2");

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

@@ -203,7 +203,8 @@ public class CmPromotionService extends CrudService<CmPromotionDao, CmPromotion>
         if ("1".equals(product.getPromotionType())) {
             // 单品满赠
             if (null != product.getPromotionMode() && 3 == product.getPromotionMode()) {
-                product.setShopID(cmPromotionDao.findShopId(product.getProductID()));
+                Integer shopId = null != product.getShopID() ? product.getShopID() : (cmPromotionDao.findShopId(product.getProductID()));
+                product.setShopID(shopId);
                 product.setProductID(null);
             }
         } else if ("2".equals(product.getPromotionType())) {

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

@@ -183,18 +183,18 @@ 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())){
+                            if (StringUtils.isNotBlank(cmPromotion.getType()) && "2".equals(cmPromotion.getType())) {
                                 //凑单促销的时候取的是skuId
-                                productId=productService.getProductIdBySku(productId);
+                                productId = productService.getProductIdBySku(productId);
                             }
                             Product product = productService.get(productId);
                             promotionProducts.add(product);
                         }
                     }
                 } else {
-                    if(StringUtils.isNotBlank(cmPromotion.getType()) && "2".equals(cmPromotion.getType())){
+                    if (StringUtils.isNotBlank(cmPromotion.getType()) && "2".equals(cmPromotion.getType())) {
                         //凑单促销的时候取的是skuId
-                        String productId=productService.getProductIdBySku(cmPromotion.getProductIds());
+                        String productId = productService.getProductIdBySku(cmPromotion.getProductIds());
                         cmPromotion.setProductIds(productId);
                     }
                     Product product = productService.get(cmPromotion.getProductIds());
@@ -207,29 +207,13 @@ public class CmPromotionController extends BaseController {
                     String[] split = cmPromotion.getGiftIds().split(",");
                     for (String skuId : split) {
                         if (StringUtil.isNotBlank(skuId)) {
-                            if ("1".equals(cmPromotion.getType()) && "3".equals(cmPromotion.getMode())) {
-                                List<CmSku> skuList = productService.findSkuList(Integer.valueOf(skuId));
-                                Product product = productService.get(skuId);
-                                product.setSkuId(skuList.get(0).getSkuId());
-                                product.setUnit(skuList.get(0).getUnit());
-                                giftProducts.add(product);
-                            } else {
                                 Product product = productService.getBySku(skuId);
                                 giftProducts.add(product);
-                            }
                         }
                     }
                 } else {
-                    if ("1".equals(cmPromotion.getType()) && "3".equals(cmPromotion.getMode())) {
-                        Product product = productService.get(cmPromotion.getGiftIds());
-                        List<CmSku> skuList = productService.findSkuList(Integer.valueOf(cmPromotion.getGiftIds()));
-                        product.setSkuId(skuList.get(0).getSkuId());
-                        product.setUnit(skuList.get(0).getUnit());
-                        giftProducts.add(product);
-                    } else {
                         Product product = productService.getBySku(cmPromotion.getGiftIds());
                         giftProducts.add(product);
-                    }
                 }
             }
             if (StringUtil.isNotBlank(cmPromotion.getShopIds())) {
@@ -441,6 +425,9 @@ public class CmPromotionController extends BaseController {
         model.addAttribute("ids", product.getIds());
         model.addAttribute("delProductIds", product.getDelProductIds());
         if ("1".equals(product.getPromotionType())) {
+            if (null != product.getPromotionMode() && 3 == product.getPromotionMode()) {
+                return "modules/product-new/promotionSelectProducts";
+            }
             return "modules/product-new/promotionSelectSingleProduct";
         } else {
             return "modules/product-new/promotionSelectProducts";

src/main/resources/mappings/modules/order/CmRefundShopRecordMapper.xml

@@ -122,7 +122,7 @@
                a.shopOrderID      AS "shopOrderID",
                a.shopOrderNo      AS "shopOrderNo",
                SUM(a.payAmount)   AS "payAmount",
-               SUM(a.wipePayment) AS "wipePayment",
+               ifnull(SUM(a.wipePayment), 0) AS "wipePayment",
                a.payType          AS "payType",
                a.payTime          AS "payTime",
                a.wipeTime         AS "wipeTime",

src/main/resources/mappings/modules/product/CmPromotionMapper.xml

@@ -128,7 +128,7 @@
                  LEFT JOIN shop s ON s.shopID = p.shopID
         WHERE cp.id = #{id} and cs.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=cs.productId)
           and p.productCategory = 1
-        group by p.productID
+        group by cpg.skuId
     </select>
 
     <select id="findGiftPurchaseProduct" resultType="com.caimei.modules.bulkpurchase.entity.PurchaseProduct">

src/main/webapp/WEB-INF/views/modules/consult/type/cmConsulttypeList.jsp

@@ -73,9 +73,9 @@
     <shiro:hasPermission name="user:agency:cmConsulttype">
         <li class="active"><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
     </shiro:hasPermission>
-    <shiro:hasPermission name="user:agency:cmrenaksList">
+    <<%--shiro:hasPermission name="user:agency:cmrenaksList">
         <li><a href="${ctx}/new/user/agency/cmrenaksList">咨询关键词库</a></li>
-    </shiro:hasPermission>
+    </shiro:hasPermission>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="cmConsulttype" action="${ctx}/consult/type/cmConsulttype/" method="post"
            class="breadcrumb form-search">

src/main/webapp/WEB-INF/views/modules/order/cmPayShopCheck.jsp

@@ -348,10 +348,12 @@
                         </c:forEach>
                     </td>
                     <td>
-                            ${s.income}
+                        <c:if test="${empty s.brokerage}">0.00</c:if>
+                        <c:if test="${not empty s.brokerage}">${s.brokerage}</c:if>
+                         <%--   ${s.income}
                         <c:if test="${not empty s.rebateFee}">
                             <span style="color: red">(含返佣服务费￥${s.rebateFee})</span>
-                        </c:if>
+                        </c:if>--%>
                     </td>
                     <td>
                         <label class="clubFreight" style="display: none">

src/main/webapp/WEB-INF/views/modules/order/cmPayShopDetail.jsp

@@ -610,7 +610,7 @@
                                     0.00
                                 </c:if>
                             </td>
-                            <td><fmt:formatNumber value="${p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
+                            <td><fmt:formatNumber value="${p.returnedNum == p.returnedNum ? 0.00 : p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
                             <td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
                             <td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
                             <td class="p-taxes-t"><c:choose>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopEdit.jsp

@@ -360,7 +360,7 @@
                                     0.00
                                 </c:if>
                             </td>
-                            <td><fmt:formatNumber value="${p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
+                            <td><fmt:formatNumber value="${p.returnedNum == p.returnedNum ? 0.00 : p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
                             <td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
                             <td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
                             <td class="p-taxes-t"><c:choose>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp

@@ -692,7 +692,7 @@
                                     0.00
                                 </c:if>
                             </td>
-                            <td><fmt:formatNumber value="${p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
+                            <td><fmt:formatNumber value="${p.returnedNum == p.returnedNum ? 0.00 : p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
                             <td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
                             <td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
                             <td class="p-taxes-t"><c:choose>

src/main/webapp/WEB-INF/views/modules/order/cmPayShopPrintDetail.jsp

@@ -368,7 +368,7 @@
 										0.00
 									</c:if>
 								</td>
-								<td><fmt:formatNumber value="${p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
+								<td><fmt:formatNumber value="${p.returnedNum == p.returnedNum ? 0.00 : p.cmCostPrice}" type="number" pattern="#,##0.00"/></td>
 								<td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
 								<td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
 								<td class="p-taxes-t"><c:choose>

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

@@ -229,6 +229,7 @@
         }
 
         function deleteProduct(obj, type) {
+            debugger;
             //将该行数据取消勾选，若存在数据库中则将其存入delProductIds中
             $(".check-item[value=" + obj + "]").prop("checked", false);
             var delProductIds = $("#delProductIds").val();
@@ -242,15 +243,20 @@
                 $("#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) {
+                if ($('#contentTbody tr').size() < 1) {
                     $("#productIds").val('');
+                    $("#giftIds").val('');
+                    var showSelectProductID = '';
+                    $('#contentTbody1 tr').each(function (index, item) {
+                        var $this = $(this);
+                        var $itemProductID = $this.find('input[name="gift"]').val();
+                        showSelectProductID += $itemProductID + ',';
+                    });
+                    $("#delGiftIds").val(showSelectProductID);
+                    var tbody = document.getElementById("contentTbody1");
+                    while (tbody.firstChild) {
+                        tbody.removeChild(tbody.firstChild);
+                    }
                 }
             }
             if (2 === type) {
@@ -262,13 +268,6 @@
                 $("#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('');
                 }

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

@@ -36,14 +36,16 @@
         });
 
         function checkSkuValue(index) {
-            var skus = JSON.parse($("#hideSku").val());
+            var sku = "#hideSku" + index;
+            var skus = JSON.parse($(sku).val());
             var price = "price" + index;//单价
             var chose = "#ints" + index;//选中的sku
             var skuStr = $(chose).val();
             var skuIndex = skuStr.split("/")[1];
             var skuId = skuStr.split("/")[0];
             document.getElementById(price).innerHTML = skus[skuIndex].price;
-            $("#skuId").val(skuId);
+            var checkSkuId = "#skuId" + index;
+            $(checkSkuId).val(skuId);
         }
     </script>
 </head>
@@ -54,6 +56,8 @@
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <form:hidden path="productIds"/>
     <form:hidden path="promotionType"/>
+    <form:hidden path="promotionMode"/>
+    <form:hidden path="shopID"/>
     <form:hidden path="ids"/>
     <form:hidden path="delProductIds"/>
     <div class="ul-form">
@@ -84,13 +88,14 @@
         <c:forEach items="${page.list}" var="item" varStatus="state">
             <tr id="${item.productID}" class="itemtr">
                 <th>
-                    <input id="skuId" class="check-item" type="checkbox" name="info" value='${item.skuList[0].skuId}'/>
+                    <input id="skuId${state.index}" class="check-item" type="checkbox" name="info"
+                           value='${item.skuList[0].skuId}'/>
                 </th>
                 <td>${item.productID}</td>
                 <td><img src="${item.mainImage}" width="50px" height="50px"></td>
                 <td>${item.name}</td>
                 <td>
-                    <input id="hideSku" value='${fns:toJson(item.skuList)}' hidden>
+                    <input id="hideSku${state.index}" value='${fns:toJson(item.skuList)}' hidden>
                     <select id="ints${state.index}" onchange="checkSkuValue(${state.index});">
                         <c:forEach items="${item.skuList}" var="skus" varStatus="ind">
                             <option value="${skus.skuId}/${ind.index}">${skus.unit}</option>

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

@@ -229,27 +229,29 @@
 
         function deleteProduct(obj, type) {
             //将该行数据取消勾选，若存在数据库中则将其删除
-            var delProductIds = $("#delShopIds").val();
-            var delGiftIds = $("#delGiftIds").val();
             $(".check-item[value=" + obj + "]").prop("checked", false);
             if (3 === type) {
-                if (delShopIds != '') {
-                    delShopIds = delShopIds + "," + obj;
-                } else {
-                    delShopIds = obj;
-                }
-                $("#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('');
+                $("#delShopIds").val(shopIds);
+                var shop = $('#shop' + obj);
+                $(shop).remove();
+                var showSelectProductID = '';
+                $('#contentTbody1 tr').each(function (index, item) {
+                    var $this = $(this);
+                    var $itemProductID = $this.find('input[name="gift"]').val();
+                    showSelectProductID += $itemProductID + ',';
+                });
+                $("#delGiftIds").val(showSelectProductID);
+                $("#shopIds").val('');
+                $("#giftIds").val('');
+                var tbody = document.getElementById("contentTbody1");
+                while (tbody.firstChild) {
+                    tbody.removeChild(tbody.firstChild);
                 }
             }
             if (2 === type) {
@@ -261,13 +263,6 @@
                 $("#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,15 +280,20 @@
                 $("#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) {
+                if ($('#contentTbody tr').size() < 1) {
                     $("#productIds").val('');
+                    $("#giftIds").val('');
+                    var showSelectProductID = '';
+                    $('#contentTbody1 tr').each(function (index, item) {
+                        var $this = $(this);
+                        var $itemProductID = $this.find('input[name="gift"]').val();
+                        showSelectProductID += $itemProductID + ',';
+                    });
+                    $("#delGiftIds").val(showSelectProductID);
+                    var tbody = document.getElementById("contentTbody1");
+                    while (tbody.firstChild) {
+                        tbody.removeChild(tbody.firstChild);
+                    }
                 }
             } else if (2 === type) {
                 if (delGiftIds != '') {
@@ -299,13 +304,6 @@
                 $("#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('');
                 }

src/main/webapp/WEB-INF/views/modules/userNew/ReportList.jsp

@@ -263,9 +263,9 @@
 <shiro:hasPermission name="user:agency:cmConsulttype">
     <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
 </shiro:hasPermission>
-<shiro:hasPermission name="user:agency:cmrenaksList">
+<%--<shiro:hasPermission name="user:agency:cmrenaksList">
     <li><a href="${ctx}/new/user/agency/cmrenaksList">咨询关键词库</a></li>
-</shiro:hasPermission>
+</shiro:hasPermission>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="cmReport" action="${ctx}/new/user/agency/ReportList" method="post"
            class="breadcrumb form-search">

src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

@@ -85,9 +85,9 @@
     <shiro:hasPermission name="user:agency:cmConsulttype">
         <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
     </shiro:hasPermission>
-    <shiro:hasPermission name="user:agency:cmrenaksList">
+<%--    <shiro:hasPermission name="user:agency:cmrenaksList">
         <li><a href="${ctx}/new/user/agency/cmrenaksList">咨询关键词库</a></li>
-    </shiro:hasPermission>
+    </shiro:hasPermission>--%>
 </ul>
 <br/>
 <form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/regist" method="post"

src/main/webapp/WEB-INF/views/modules/userNew/cmRemaksList.jsp

@@ -41,9 +41,9 @@
     <shiro:hasPermission name="user:agency:cmConsulttype">
         <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
     </shiro:hasPermission>
-    <shiro:hasPermission name="user:agency:cmrenaksList">
+<%--    <shiro:hasPermission name="user:agency:cmrenaksList">
         <li class="active"><a href="${ctx}/new/user/agency/cmrenaksList">咨询关键词库</a></li>
-    </shiro:hasPermission>
+    </shiro:hasPermission>--%>
 </ul>
 <form:form id="searchForm" modelAttribute="cmRemaks" action="${ctx}/new/user/agency/cmrenaksList" method="post"
            class="breadcrumb form-search">

src/main/webapp/WEB-INF/views/modules/userNew/cmUnRegistRemarksList.jsp

@@ -56,9 +56,9 @@
     <shiro:hasPermission name="user:agency:cmConsulttype">
         <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
     </shiro:hasPermission>
-    <shiro:hasPermission name="user:agency:cmrenaksList">
+    <%--<shiro:hasPermission name="user:agency:cmrenaksList">
         <li><a href="${ctx}/new/user/agency/cmrenaksList">咨询关键词库</a></li>
-    </shiro:hasPermission>
+    </shiro:hasPermission>--%>
 </ul>
 <br/>
 <form:form id="searchForm" modelAttribute="visit" action="${ctx}/new/user/visit/unregist" method="post"