Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/java/com/kmall/admin/service/impl/oms2kmall/Oms2KmallServiceImpl.java

@@ -98,8 +98,14 @@ public class Oms2KmallServiceImpl implements Oms2KmallService {
 
     @Override
     public R goodsProductAuditNotice(GoodsProductAuditResponse resp) {
+        if ("1".equals(resp.getIsAudit())) {
+            resp.setIsAudit(Dict.omsAuditStatus.item_2.getItem());
+            resp.setAuditRemark(resp.getAuditRemark() + "，请重新拉取最新备案信息。");
+        } else if ("2".equals(resp.getIsAudit())) {
+            resp.setIsAudit(Dict.omsAuditStatus.item_3.getItem());
+        }
         int count = goodsProductService.updateAuditInfo(resp.getSku(), resp.getIsAudit(), resp.getAuditTime(), resp.getAuditRemark());
-        if (count > 1) {
+        if (count > 0) {
             return R.ok();
         }
         return R.error("更新0条信息");

kmall-admin/src/main/java/com/kmall/admin/utils/oms/response/GoodsProductAuditResponse.java

@@ -1,5 +1,7 @@
 package com.kmall.admin.utils.oms.response;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -7,8 +9,10 @@ public class GoodsProductAuditResponse implements Serializable {
 
     private String sku;
 
+    // 1：审核成功，2：审核失败
     private String isAudit;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date auditTime;
 
     private String auditRemark;

kmall-manager/src/main/resources/conf/db.properties

@@ -1,50 +1,23 @@
 ########## \u6570\u636E\u5E93\u914D\u7F6E ##########
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
-#jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_general?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=tuser
-#jdbc.password=Qq!123
+jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_general?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=tuser
+jdbc.password=Qq!123
 #jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=kmall_cw
 #jdbc.password=eb6zHJg%x3
-#
-#jdbc.initialSize=5
-#jdbc.maxActive=30
-#
-#jdbc.minPoolSize=2+
-#jdbc.maxIdleTime=30000
-#jdbc.idleConnectionTestPeriod=100
-#
-##---------- for hikari
-#jdbc.driver=com.mysql.jdbc.Driver
-##jdbc.driver=org.mariadb.jdbc.Driver
-#jdbc.idleTimeout=400000
-#jdbc.maxLifetime=500000
-#jdbc.connectionTimeout=5000
-#jdbc.maximumPoolSize=5
-#jdbc.validationTimeout=4000
-
-
-
-####========== \u751F\u4EA7\u73AF\u5883 ==========
-#\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
-##jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-# \u65B0\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
-#jdbc.url=jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=kmall_cw
-jdbc.password=eb6zHJg%x3
 
 jdbc.initialSize=5
 jdbc.maxActive=30
 
-jdbc.minPoolSize=2
+jdbc.minPoolSize=2+
 jdbc.maxIdleTime=30000
 jdbc.idleConnectionTestPeriod=100
 
 #---------- for hikari
-jdbc.driver=org.mariadb.jdbc.Driver
+jdbc.driver=com.mysql.jdbc.Driver
+#jdbc.driver=org.mariadb.jdbc.Driver
 jdbc.idleTimeout=400000
 jdbc.maxLifetime=500000
 jdbc.connectionTimeout=5000
@@ -52,6 +25,33 @@ jdbc.maximumPoolSize=5
 jdbc.validationTimeout=4000
 
 
+
+####========== \u751F\u4EA7\u73AF\u5883 ==========
+#\u963F\u91CC\u4E91\u5185\u7F51\u5730\u5740
+##jdbc.url=jdbc:mysql://rm-wz9rps8173a1nx63g819.mysql.rds.aliyuncs.com:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+##\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
+#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+## \u65B0\u963F\u91CC\u4E91\u5916\u7F51\u5730\u5740
+##jdbc.url=jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/kmall_cw?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=kmall_cw
+#jdbc.password=eb6zHJg%x3
+#
+#jdbc.initialSize=5
+#jdbc.maxActive=30
+#
+#jdbc.minPoolSize=2
+#jdbc.maxIdleTime=30000
+#jdbc.idleConnectionTestPeriod=100
+#
+##---------- for hikari
+#jdbc.driver=org.mariadb.jdbc.Driver
+#jdbc.idleTimeout=400000
+#jdbc.maxLifetime=500000
+#jdbc.connectionTimeout=5000
+#jdbc.maximumPoolSize=5
+#jdbc.validationTimeout=4000
+
+
 ###========== \u4E2D\u7F51\u56FD\u9645\u6570\u636E\u5E93\u5F00\u53D1\u73AF\u5883 ==========
 #jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
 #jdbc.username=tuser

kmall-manager/src/main/resources/conf/express-kdn.properties

@@ -1,7 +1,7 @@
 ########## \u5FEB\u9012-\u5FEB\u9012\u9E1F\u914D\u7F6E ##########
 
 # [dev, prod]
-express.kdn.env=prod
+express.kdn.env=dev
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
 #\u7535\u5546ID

kmall-manager/src/main/resources/conf/express-sf.properties

@@ -1,7 +1,7 @@
 ########## \u5FEB\u9012-sf\u914D\u7F6E ##########
 
 # [dev, prod]
-express.sf.env=prod
+express.sf.env=dev
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========
 #\u8D26\u53F7

kmall-manager/src/main/resources/conf/redis.properties

@@ -1,7 +1,7 @@
 ########## redis \u914D\u7F6E ##########
 
 # [dev, prod]
-redis.env=prod
+redis.env=dev
 
 # \u5F00\u53D1\u73AF\u5883
 redis.dev.keyPrefix=platform

kmall-manager/src/main/resources/conf/wx-mp.properties

@@ -1,7 +1,7 @@
 ########## \u5FAE\u4FE1\u5C0F\u7A0B\u5E8F\u914D\u7F6E ##########
 
 # [dev, prod]
-pay.wx.env=prod
+pay.wx.env=dev
 
 
 #========== \u5F00\u53D1\u73AF\u5883 ==========