From c436aa8d9d4ba815d13d2fa205f1cc46d63a552d Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Tue, 1 Oct 2024 10:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/iocoder/yudao/util/WechatPayConfig.java  | 4 ++--
 .../service/impl/AppInspectionGoodsServiceImpl.java           | 3 ++-
 .../yudao/module/payment/controller/WxPayController.java      | 4 +++-
 .../mapper/inspection/AppInspectionPartnerMapper.xml          | 2 +-
 .../rescue/app/controller/admin/RescueDriverSocket.java       | 2 +-
 .../module/rescue/controller/admin/RescuePayController.java   | 2 ++
 .../security/config/YudaoWebSecurityConfigurerAdapter.java    | 2 +-
 yudao-server/src/main/resources/application.yaml              | 4 ++++
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/util/WechatPayConfig.java b/dl-module-base/src/main/java/cn/iocoder/yudao/util/WechatPayConfig.java
index d0087e46..172802d3 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/util/WechatPayConfig.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/util/WechatPayConfig.java
@@ -53,7 +53,8 @@ public class WechatPayConfig {
     /**
      * 支付通知回调地址
      */
-    private String notifyUrl="https://www.nuoyunr.com/rescue/rescuePayApi/payNotify";
+    private String notifyUrl="https://www.nuoyunr.com/admin-api/rescuePayApi/payNotify";
+    private String jcNotifyUrl="https://www.nuoyunr.com/admin-api/payApi/payNotify";
     /**
      * 退款回调地址
      */
@@ -83,7 +84,6 @@ public class WechatPayConfig {
 
     private String jcAppId = "wx5eeea06aeaae4f89";
     private String jcAppSecret = "42207958589342d9d1d287b9cb53e289";
-    private String jcNotifyUrl="https://www.nuoyunr.com/admin-api/payApi/payNotify";
     private String jcRefundNotifyUrl="https://www.nuoyunr.com/admin-api/payApi/refundNotify";
 
     private String repairAppId="wxee677d54037bc5ac";
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java
index 85c0ce34..c1e1f1fc 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionGoodsServiceImpl.java
@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -385,7 +386,7 @@ public class AppInspectionGoodsServiceImpl extends ServiceImpl<AppInspectionGood
         res.setCouponNum(count);
         //计算积分余额
         UserBalance shopUserBalance = userBalanceService.selectShopUserBalanceByUserId(userId);
-        res.setBalance(shopUserBalance.getBalance());
+        res.setBalance(ObjectUtils.isEmpty(shopUserBalance)?0:shopUserBalance.getBalance());
         return res;
     }
 }
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/WxPayController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/WxPayController.java
index d4e4cf3b..c5def86a 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/WxPayController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/WxPayController.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
 import cn.iocoder.yudao.module.partner.entity.PartnerBankInfo;
 import cn.iocoder.yudao.module.payment.entity.FzRecord;
@@ -187,6 +188,7 @@ public class WxPayController {
      */
 
     @GetMapping("/jcPrepayment")
+    @TenantIgnore
     public Map<String,Object> jcPrepayment(String type,Long orderId) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException, IOException {
 
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
@@ -198,7 +200,7 @@ public class WxPayController {
 
         String prepayId = this.toGetPayInfo(wechatPayConfig.getJcAppId(), bankInfo.getMchId(), bankInfo.getApiclientKey(), orderInfo.getPayMoney().intValue()
                 , user.getJcOpenId(), bankInfo.getSerialNo(), bankInfo.getApiV3Key(), orderInfo.getGoodsTitle(),
-                wechatPayConfig.getNotifyUrl(), orderInfo.getOrderNo());
+                wechatPayConfig.getJcNotifyUrl(), orderInfo.getOrderNo());
         Map<String, Object> resMap = paySignMsg(prepayId, wechatPayConfig.getJcAppId(),bankInfo.getApiclientKey());
         return resMap;
     }
diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml
index b7039a01..f1451549 100644
--- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml
@@ -113,7 +113,7 @@
          sum((oi.pay_time like CONCAT(#{timeStr},'%') and oi.create_time like CONCAT(#{timeStr},'%'))),0) as workedNum
     FROM
       order_info oi
-    WHERE oi.partner_id = #{partnerId}
+
 </select>
 <select id="allAmount" resultType="java.lang.Integer">
 SELECT
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java
index 03a66fa4..1e9b1549 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java
@@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @Date: 2023/7/9 10:21
  * @Description :
  */
-@ServerEndpoint(value = "/admin-api/websocket/rescueDriver/{driverId}")
+@ServerEndpoint(value = "/websocket/rescueDriver/{driverId}")
 @Component
 public class RescueDriverSocket {
     private final static Logger log = LoggerFactory.getLogger(RescueDriverSocket.class);
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescuePayController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescuePayController.java
index e0b8f93b..5765fe07 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescuePayController.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescuePayController.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.rescue.controller.admin;
 
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.rescue.core.controller.BaseController;
 import cn.iocoder.yudao.module.rescue.domain.RescueInfo;
 import cn.iocoder.yudao.module.rescue.service.IRescueOrderInfoService;
@@ -28,6 +29,7 @@ public class RescuePayController extends BaseController {
     }
 //    @ApiOperation(value = "支付回调", notes = "支付回调")
     @PostMapping("/payNotify")
+    @TenantIgnore
     public Map<String, String> payNotify(@RequestBody JSONObject jsonObject) {
         return rescueOrderInfoService.payNotify(jsonObject);
     }
diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
index e20ff358..a763e323 100644
--- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
+++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
@@ -148,7 +148,7 @@ public class YudaoWebSecurityConfigurerAdapter {
                 .antMatchers("/userClient/pay/**").permitAll()
                 .antMatchers("/userClient/weChat/**","/userClient/repair/wxLogin").permitAll()
                 .antMatchers("/admin-api/websocket/**").permitAll()
-                .antMatchers("/websocket/**").permitAll()
+                .antMatchers("/websocket/**","/admin-api/payApi/payNotify","/admin-api/rescuePayApi/payNotify").permitAll()
                 // 小程序首页
                 .antMatchers("/admin-api/system/notice/listWx","/admin-api/system/swiper/listWx","/admin-api/system/shopconfig/listWx").permitAll()
                 // 蓝安救援
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index c7173248..9ba332b4 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -235,6 +235,8 @@ yudao:
       - /userClient/base/company/page #查询可提供服务的子公司，不需要登录
       - /userClient/base/company/get #查询可提供服务的子公司详情，不需要登录
       - /admin-api/rescue/driverLogin
+      - /admin-api/rescuePayApi/payNotify
+      - /admin-api/payApi/payNotify
   websocket:
     enable: true # websocket的开关
     path: /infra/ws # 路径
@@ -292,6 +294,8 @@ yudao:
       - /userClient/**
       - /admin-api/ueditor/**
       - /admin-api/rescue/driverLogin
+      - /admin-api/rescuePayApi/payNotify
+      - /admin-api/payApi/payNotify
 
     ignore-tables:
       - system_tenant