‘linchangsheng’ 1 week ago
parent
commit
1f24ee3519

+ 2 - 3
src/main/java/com/gree/mall/manager/config/wx/WxConfiguration.java

@@ -46,13 +46,12 @@ public class WxConfiguration {
     @Autowired
     RedisUtil redisUtil;
     @Autowired
-    AdminCompanyWechatService AdminCompanyWechatService;
-
+    AdminCompanyWechatService adminCompanyWechatService;
 
     @PostConstruct
     public void initWxServices() {
         //查询企业微信配置
-        List<AdminCompanyWechat> list = AdminCompanyWechatService.list();
+        List<AdminCompanyWechat> list = adminCompanyWechatService.list();
         reloadWxConfig(list, redisUtil, keyPath, notifyUrl);
         //初始化微信小程序服务
         initWxMaService(redisUtil, wechatSubAppid, wechatSubSecret);

+ 2 - 2
src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -401,7 +401,7 @@ public class OrderLogic {
         log.info("【退款开始:】退款金额{}", refundAmount);
         if (!orderInfo.getPayType().equals("云闪付")) {
             wechatLogic.refund(orderId, orderId + StringUtil.getUUID(), orderInfo.getPayAmount().doubleValue()
-                    , refundAmount.doubleValue(), orderInfo.getCompanyWechatId());
+                    , refundAmount.doubleValue(), orderInfo.getPayWorkerCodeId());
         } else {
             umsLogic.refund(orderId, orderInfo.getPayAmount().doubleValue()
                     , refundAmount.doubleValue(), orderInfo.getWebsitId());
@@ -517,7 +517,7 @@ public class OrderLogic {
         log.info("【退款开始:】退款金额{},order_id={}", refundAmount, orderInfo.getOrderId());
         if (!orderInfo.getPayType().equals("云闪付")) {
             wechatLogic.refund(orderId, orderId + StringUtil.getUUID(), orderInfo.getPayAmount().doubleValue()
-                    , refundAmount.doubleValue(), orderInfo.getCompanyWechatId());
+                    , refundAmount.doubleValue(), orderInfo.getPayWorkerCodeId());
         } else {
             umsLogic.refund(orderId, orderInfo.getPayAmount().doubleValue()
                     , refundAmount.doubleValue(), orderInfo.getWebsitId());