Browse Source

修改订单的相关信息为常来此购的

Yangzw 9 months ago
parent
commit
220957f7c9

+ 7 - 9
feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/utils/wechat/WcChatMessageUtils.java

@@ -27,7 +27,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-import static cn.newfeifan.mall.module.system.constant.SystemConstants.SYSTEM_WX_ACCESS_TOKEN;
+import static cn.newfeifan.mall.module.system.constant.SystemConstants.WX_TICK_KEY_APPID;
 import static cn.newfeifan.mall.module.trade.enums.MessageTemplateConstants.AFTER_SALE_NO_CHECK_List;
 import static cn.newfeifan.mall.module.trade.enums.MessageTemplateConstants.ORDER_NO_DELIVERY_List;
 
@@ -39,12 +39,10 @@ import static cn.newfeifan.mall.module.trade.enums.MessageTemplateConstants.ORDE
 @Slf4j
 public class WcChatMessageUtils {
 
-//    @Value("${wx.mp.app-id}")
-    //暂时写死(常来此购)
-    private String appid = "wxe133514440a8829d";
-//    @Value("${wx.mp.secret}")
-    //暂时写死(常来此购)
-    private String Wxgsecret = "4f99fb0f90ebf12807887bf1aa26d8e9";
+    @Value("${wx.mp.app-id}")
+    private String appid;
+    @Value("${wx.mp.secret}")
+    private String Wxgsecret;
 
     @Resource
     private StringRedisTemplate stringRedisTemplate;
@@ -68,7 +66,7 @@ public class WcChatMessageUtils {
      */
     public String getAccessToken() {
 
-        String accessToken = stringRedisTemplate.opsForValue().get(SYSTEM_WX_ACCESS_TOKEN);
+        String accessToken = stringRedisTemplate.opsForValue().get(WX_TICK_KEY_APPID);
 
         if (StrUtil.isEmpty(accessToken)) {
             // 服务号的appid以及秘钥
@@ -84,7 +82,7 @@ public class WcChatMessageUtils {
 
             //微信的accessToken的失效时间是两个小时,这里改为一小时五十五分钟,怕双方的时间误差导致accessToken失效
             long expireTime = 60 * 60 + 55 * 60; // 1小时55分钟转换为秒
-            stringRedisTemplate.opsForValue().set(SYSTEM_WX_ACCESS_TOKEN, accessToken, expireTime, java.util.concurrent.TimeUnit.SECONDS);
+            stringRedisTemplate.opsForValue().set(WX_TICK_KEY_APPID, accessToken, expireTime, java.util.concurrent.TimeUnit.SECONDS);
         }
 
 

+ 4 - 0
feifan-module-system/feifan-module-system-api/src/main/java/cn/newfeifan/mall/module/system/constant/SystemConstants.java

@@ -1,8 +1,12 @@
 package cn.newfeifan.mall.module.system.constant;
 
 public class SystemConstants {
+    //现在用不上了(非繁科技)
     public static final String SYSTEM_WX_ACCESS_TOKEN = "system:wx:access_token";
 
+    //常来此购的公众
+    public static final String WX_TICK_KEY_APPID = "wechat:access_token";
+
     public static final String SYSTEM_WX_MESSAGE_TEMPLATE = "system:wx:message:template:";
 
     public static final String SYSTEM_CONFIG = "system:config";

+ 6 - 2
feifan-server/src/main/resources/application-prod.yaml

@@ -182,8 +182,12 @@ wx:
   mp: # 公众号配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
 #    app-id: wx041349c6f39b268b # 测试号(牛希尧提供的)
 #    secret: 5abee519483bc9f8cb37ce280e814bd0
-    app-id: wx917c16ecb85e8fb8 # 测试号(自己的)
-    secret: e6be2d75ba7dc0f3d833469645062b79
+#    app-id: wx917c16ecb85e8fb8 # 测试号(自己的)
+#    secret: e6be2d75ba7dc0f3d833469645062b79
+
+    app-id: wxe133514440a8829d # 常来此购(客户的)
+    secret: 4f99fb0f90ebf12807887bf1aa26d8e9
+
 #    app-id: wxa69ab825b163be19 # 测试号(Kongdy 提供的)
 #    secret: bd4f9fab889591b62aeac0d7b8d8b4a0
     # 存储配置,解决 AccessToken 的跨节点的共享

+ 1 - 1
feifan-server/src/main/resources/application.yaml

@@ -250,7 +250,7 @@ feifan:
     end-code: 9999 # 这里配置 9999 的原因是,测试方便。
   trade:
     order:
-      app-id: 1 # 商户编号
+      app-id: 9 # 商户编号
       pay-expire-time: 2h # 支付的过期时间
       receive-expire-time: 14d # 收货的过期时间
       comment-expire-time: 7d # 评论的过期时间