阶梯价格优化

src/main/java/com/caimei/modules/product/dao/ProductDao.java

@@ -166,7 +166,7 @@ public interface ProductDao extends CrudDao<Product> {
 
     void deleteLadderPriceByProductId(Integer productID);
 
-    void deleteLadderPriceById(Integer productId);
+    void deleteLadderPriceById(@Param("skuId") Integer skuId,@Param("productId")Integer productId);
 
     List<Product> findActList(Product product);
 

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

@@ -470,7 +470,6 @@ public class ProductService extends CrudService<ProductDao, Product> {
     private void updateSku(Product product) {
         List<CmSku> skuList = product.getSkuList();
         if (null != skuList && skuList.size() > 0) {
-            productDao.deleteLadderPriceById(product.getProductID());
             List<Integer> skuIds = new ArrayList<>();
             skuList.forEach(s -> {
                 if (null != s.getPrice()) {
@@ -484,6 +483,9 @@ public class ProductService extends CrudService<ProductDao, Product> {
                         productDao.insertSku(s);
                         skuIds.add(s.getSkuId());
                     }
+                    if (s.getLadderPriceFlag()==1) {
+                        productDao.deleteLadderPriceById(s.getSkuId(),s.getProductId());
+                    }
                     if (null != s.ladderPriceFlag() && 1 == s.ladderPriceFlag()) {
                         List<CmLadderPrice> cmLadderPrices = s.ladderPriceList();
                         for (int i = 0; i < cmLadderPrices.size(); i++) {
@@ -504,11 +506,15 @@ public class ProductService extends CrudService<ProductDao, Product> {
         //保存sku
         List<CmSku> skuList = product.getSkuList();
         if (null != skuList && skuList.size() > 0) {
-            productDao.deleteLadderPriceById(product.getProductID());
+//            productDao.deleteLadderPriceById(product.getProductID());
             skuList.forEach(s -> {
+
                 if (null != s.getPrice()) {
                     s.productId(product.getProductID());
                     productDao.insertSku(s);
+                    if (s.getLadderPriceFlag().equals("1")) {
+                        productDao.deleteLadderPriceById(s.getSkuId(),s.getProductId());
+                    }
                     if (null != s.ladderPriceFlag() && 1 == s.ladderPriceFlag()) {
                         List<CmLadderPrice> cmLadderPrices = s.ladderPriceList();
                         for (int i = 0; i < cmLadderPrices.size(); i++) {

src/main/resources/config/dev/caimei.properties

@@ -12,14 +12,14 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.cj.jdbc.Driver
-#jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-#jdbc.username=developer
-#jdbc.password=J5p3tgOVazNl4ydf
+jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+jdbc.username=developer
+jdbc.password=J5p3tgOVazNl4ydf
 
 
-jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-jdbc.username=developer
-jdbc.password=05bZ/OxTB:X+yd%1
+#jdbc.url=jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#jdbc.username=developer
+#jdbc.password=05bZ/OxTB:X+yd%1
 
 #jdbc.url=jdbc:mysql://119.29.0.46:3306/caimei?useUnicode=true&characterEncoding=utf-8
 #jdbc.username=root

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

@@ -1165,7 +1165,7 @@
     <delete id="deleteLadderPriceById">
         DELETE
         FROM product_ladder_price
-        where productId = #{productId}
+        where productId = #{productId} and skuId = #{skuId}
     </delete>
     <delete id="deleteSkus">
         delete

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

@@ -298,7 +298,7 @@
     </c:if>
 </ul>
 <form:form id="inputForm" modelAttribute="product"
-           action="${ctx}/product/new/productSave?searchShopID=${product.searchShopID}&searchShopName=${product.searchShopName}&searchBigTypeID=${product.searchBigTypeID}&searchSmallTypeID=${product.searchSmallTypeID}&searchTinyTypeID=${product.searchTinyTypeID}&searchValidFlag=${product.searchValidFlag}&searchActStatus=${product.searchActStatus}&searchProductType=${product.searchProductType}&searchBrandID=${product.searchBrandID}&searchPreferredFlag=${product.searchPreferredFlag}&searchProductCategory=${product.searchProductCategory}&editFlag=${product.editFlag}&shopType=${product.shopType}"
+           action="${ctx}/product/new/productSave?searchShopID=${product.searchShopID}&searchShopName=${product.searchShopName}&searchBigTypeID=${product.searchBigTypeID}&searchSmallTypeID=${product.searchSmallTypeID}&searchTinyTypeID=${product.searchTinyTypeID}&searchValidFlag=${product.searchValidFlag}&searchActStatus=${product.searchActStatus}&searchProductType=${product.searchProductType}&searchBrandID=${product.searchBrandID}&searchPreferredFlag=${product.searchPreferredFlag}&searchProductCategory=${product.searchProductCategory}&editFlag=${product.editFlag}&shopType=${product.shopType}&ladderPriceFlag=${product.ladderPriceFlag}"
            method="post" class="form-horizontal">
     <form:hidden path="id"/>
     <form:hidden path="searchName"/>