Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-common/src/main/java/com/fs/common/core/redis/service/StockDeductService.java

@@ -31,8 +31,6 @@ public class StockDeductService {
 
     // 库存扣减Lua脚本（预编译，提升高并发性能）
     private static final DefaultRedisScript<Long> STOCK_DEDUCT_SCRIPT;
-    // 锁释放Lua脚本（预编译）
-    private static final DefaultRedisScript<Long> LOCK_RELEASE_SCRIPT;
 
     // 库存扣减Lua脚本（优化后，增强健壮性）
     static {
@@ -40,11 +38,6 @@ public class StockDeductService {
         STOCK_DEDUCT_SCRIPT = new DefaultRedisScript<>();
         STOCK_DEDUCT_SCRIPT.setScriptText("if redis.call('exists', KEYS[1]) ~= 1 then " + "return -2; " + "end " + "local stock_str = redis.call('get', KEYS[1]); " + "local stock = tonumber(stock_str); " + "if stock == nil then " + "return -3; " + "end " + "local deductNum_str = ARGV[1]; " + "local deductNum = tonumber(deductNum_str); " + "if deductNum == nil or deductNum <= 0 then " + "return -4; " + "end " + "if stock >= deductNum then " + "return redis.call('decrby', KEYS[1], deductNum); " + "else " + "return -1; " + "end");
         STOCK_DEDUCT_SCRIPT.setResultType(Long.class);
-
-        // 锁释放脚本保持不变
-        LOCK_RELEASE_SCRIPT = new DefaultRedisScript<>();
-        LOCK_RELEASE_SCRIPT.setScriptText("if redis.call('get', KEYS[1]) == ARGV[1] then " + "return redis.call('del', KEYS[1]) " + "else return 0 end");
-        LOCK_RELEASE_SCRIPT.setResultType(Long.class);
     }
 
     /**
@@ -55,7 +48,7 @@ public class StockDeductService {
      */
     public void initStock(Long productId, Long liveId, Integer initStock) {
         String stockKey = RedisConstant.STOCK_KEY_PREFIX + liveId + ":" + productId;
-        redisTemplate.opsForValue().set(stockKey, initStock, 24 * 60 * 60, TimeUnit.SECONDS);
+        redisTemplate.opsForValue().set(stockKey, initStock);
         log.info("商品" + productId + "库存初始化完成，初始库存：" + initStock);
     }
 

fs-service/src/main/java/com/fs/wx/order/service/impl/ShopExpressToWxService.java

@@ -65,13 +65,13 @@ public class ShopExpressToWxService extends ExpressToWxService {
     @Override
     public String getExpressCompany() {
 
-        return fsStoreOrder.getDeliveryCode();
+        return fsStoreOrder.getDeliverySn();
     }
 
     @Override
     public String getExpressNo() {
 
-        return fsStoreOrder.getDeliverySn();
+        return fsStoreOrder.getDeliveryId();
     }
 
     @Override

fs-service/src/main/resources/application-config-druid-bjzm-test.yml

@@ -15,8 +15,8 @@ logging:
 wx:
   miniapp:
     configs:
-      - appid: wxcc2de555e32acb08   #百域佳选
-        secret: 76eaf5e27ad79abb237c7a83ed8b80a3 #北京卓美
+      - appid: wx9bb2cd1e3afe714e   #百域佳选
+        secret: 56a2a3314d4b73eea2eac7e8b861b321 #北京卓美
         token: cbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON

fs-service/src/main/resources/application-config-druid-bjzm.yml

@@ -10,8 +10,8 @@ logging:
 wx:
   miniapp:
     configs:
-      - appid: wxcc2de555e32acb08   #百域佳选
-        secret: 76eaf5e27ad79abb237c7a83ed8b80a3 #北京卓美
+      - appid: wx9bb2cd1e3afe714e   #百域佳选
+        secret: 56a2a3314d4b73eea2eac7e8b861b321 #北京卓美
         token: cbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON

fs-service/src/main/resources/application-druid-bjzm.yml

@@ -124,7 +124,7 @@ spring:
                 slave:
                     # 从数据源开关/默认关闭
                     enabled: true
-                    url: jdbc:mysql://172.16.0.24:3306/fs_his?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.16.16.135:3306/fs_his?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Ylrz_1q2w3e4r5t6y
                     # 初始连接数