Browse Source

阶梯价格优化

kaick 2 years ago
parent
commit
188ec69c33

+ 2 - 1
src/main/java/com/caimei/modules/baike/service/CmBaikeProductService.java

@@ -18,6 +18,7 @@ import com.caimei.modules.utils.message.MessageModel;
 import com.caimei.modules.utils.message.MqInfo;
 import com.caimei.modules.utils.message.enums.MessageType;
 import com.caimei.utils.StringUtil;
+import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -294,7 +295,7 @@ public class CmBaikeProductService extends CrudService<CmBaikeProductDao, CmBaik
         }
         map.append("}}");
         try {
-            System.out.println(RequestUtil.httpPost("http://localhost:18002/tools/message/send", String.valueOf(map)));
+            System.out.println(RequestUtil.httpPost(Global.getConfig("caimei.core")+"/tools/message/send", String.valueOf(map)));
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 1 - 1
src/main/java/com/caimei/modules/info/service/InfoService.java

@@ -242,7 +242,7 @@ public class InfoService extends CrudService<InfoDao, Info> {
         }
         map.append("}}");
         try {
-            System.out.println(RequestUtil.httpPost("http://localhost:18002/tools/message/send", String.valueOf(map)));
+            System.out.println(RequestUtil.httpPost(Global.getConfig("caimei.core")+"/tools/message/send", String.valueOf(map)));
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 1 - 1
src/main/resources/config/beta/caimei.properties

@@ -12,7 +12,7 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://172.31.165.28:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+jdbc.url=jdbc:mysql://120.79.25.27:3306/caimei?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
 jdbc.username=developer
 jdbc.password=J5p3tgOVazNl4ydf
 

+ 7 - 7
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
@@ -189,7 +189,7 @@ export.template=export
 
 # SPI-server\uFF08CKEditor5\u56FE\u7247\u4E0A\u4F20API\uFF0C\u641C\u7D22\u66F4\u65B0\u7D22\u5F15\uFF09
 caimei.spi=http://localhost:8008
-caimei.core=https://localhost:18002
+caimei.core=http://localhost:18002
 caimei.manager=http://localhost:9527
 #\u963F\u91CC\u4E91oss\u5B58\u50A8
 aliyun.accessKeyId=LTAI4GBL3o4YkWnbKYgf2Xia

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

@@ -2018,10 +2018,16 @@
             }
 
             console.log('ladderPrice---', ladderPrice)
+
             // 起订量
             var buyNum = $(item).find('[name$="buyNum"]');
             buyNum.val(ladderPrice.buyNum);
             buyNum.attr('name', 'skuList[' + skuIndex + '].ladderPriceList[' + index + '].buyNum');
+
+            console.log('buyNum---', ladderPrice.buyNum)
+            if(ladderPrice.buyNum!=null){
+                $(this).show()
+            }
             // 价格
             var buyPrice = $(item).find('[name$="buyPrice"]');
             buyPrice.val(ladderPrice.buyPrice);
@@ -2119,6 +2125,7 @@
                 ladderPriceBox.show();
                 minBuyNumber.parent('.sku-minBuyNumber').hide();
                 el.find('input[name$="skuList[' + i + '].ladderPriceList[0].delFlag"]').val(0);
+
             } else {
                 ladderPriceBox.hide();
                 minBuyNumber.parent('.sku-minBuyNumber').show();