From 4b289e52ceaeff65650208943e14c75427254352 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 11 Jun 2025 14:56:18 +0800
Subject: [PATCH] 11

---
 .../dto/pay/PayGetWalletInfoDto.java          |   7 ++-
 .../impl/pay/ThirdPayApiServiceImpl.java      |  43 +++++++++++++-----
 .../src/main/resources/doc/第三方支付文档.wps | Bin 168960 -> 171520 bytes
 .../java/com/bsd/pjcloud/admin/PayTest.java   |   5 +-
 .../wallet/mapper/MchManageMapper.java        |  15 +-----
 .../impl/mch/MchManageServiceImpl.java        |   2 +-
 6 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/pay/PayGetWalletInfoDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/pay/PayGetWalletInfoDto.java
index 477a35e24..445acbe7f 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/pay/PayGetWalletInfoDto.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/pay/PayGetWalletInfoDto.java
@@ -6,8 +6,13 @@ import lombok.Data;
 public class PayGetWalletInfoDto {
 
     /**
-     * sm4加密后的手机号
+     * sm4加密后的手机号(优先级userId>signPhone)
      */
     private String signPhone;
 
+    /**
+     * 用户id(优先级userId>signPhone)
+     */
+    private Long userId;
+
 }
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdPayApiServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdPayApiServiceImpl.java
index e58695748..8db2870d9 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdPayApiServiceImpl.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdPayApiServiceImpl.java
@@ -2,6 +2,8 @@ package com.bsd.pjcloud.thirdparty.service.impl.pay;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
+import com.bsd.pjcloud.admin.api.dto.UserInfo;
+import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.hard.api.feign.RemoteHardOrderService;
 import com.bsd.pjcloud.hard.api.feign.RemoteHardThirdPayService;
 import com.bsd.pjcloud.thirdparty.constant.pay.ThirdPayApiBizTypeEnum;
@@ -43,6 +45,7 @@ public class ThirdPayApiServiceImpl implements ThirdPayApiService {
     private final ThirdKeyManageService keyManageService;
     private final ThirdPayLogService payLogService;
 
+    private final RemoteUserService userService;
     private final RemoteWalletService walletService;
     private final RemoteHardOrderService hardOrderService;
     private final RemoteHardThirdPayService hardThirdPayService;
@@ -171,7 +174,7 @@ public class ThirdPayApiServiceImpl implements ThirdPayApiService {
             return baseVo;
         }
         PayGetWalletInfoDto dto = JSONUtil.toBean(json, PayGetWalletInfoDto.class);
-        if (ObjectUtil.isEmpty(dto)) {
+        if (ObjectUtil.isEmpty(dto) || ObjectUtil.isAllEmpty(dto.getSignPhone(), dto.getUserId())) {
             baseVo.set(ThirdPayVoStatusEnum.PARAMS_ERROR);
             // 日志
             logObj.setRes(JSONUtil.toJsonStr(baseVo));
@@ -179,18 +182,34 @@ public class ThirdPayApiServiceImpl implements ThirdPayApiService {
             payLogService.save(logObj);
             return baseVo;
         }
-        // 手机号解密
-        String phone = LbRetailSignUtils.sm4Decrypt(dto.getSignPhone(), keySetting.getFieldKey());
-        if (ObjectUtil.isEmpty(phone)) {
-            baseVo.set(ThirdPayVoStatusEnum.PARAMS_ERROR);
-            baseVo.setMessage("手机号解析失败");
-            // 日志
-            logObj.setRes(JSONUtil.toJsonStr(baseVo));
-            logObj.setTimeConsuming(Long.toString(System.currentTimeMillis() - startTime));
-            payLogService.save(logObj);
-            return baseVo;
+        String userPhone = null;
+        // 判断是根据手机号查询还是根据用户id查询
+        if (ObjectUtil.isNotEmpty(dto.getUserId())) {
+            UserInfo userInfo = userService.getByUserId(dto.getUserId()).getData();
+            if (ObjectUtil.isEmpty(userInfo)) {
+                baseVo.set(ThirdPayVoStatusEnum.USER_EXIST);
+                // 日志
+                logObj.setRes(JSONUtil.toJsonStr(baseVo));
+                logObj.setTimeConsuming(Long.toString(System.currentTimeMillis() - startTime));
+                payLogService.save(logObj);
+                return baseVo;
+            }
+            userPhone = userInfo.getSysUser().getPhone();
         }
-        WalletManageVo userWallet = walletService.getWalletByUserPhone(phone, WalletTypeEnum.PAY).getData();
+        if (ObjectUtil.isNotEmpty(dto.getSignPhone()) && ObjectUtil.isEmpty(dto.getUserId())) {
+            // 手机号解密
+            userPhone = LbRetailSignUtils.sm4Decrypt(dto.getSignPhone(), keySetting.getFieldKey());
+            if (ObjectUtil.isEmpty(userPhone)) {
+                baseVo.set(ThirdPayVoStatusEnum.PARAMS_ERROR);
+                baseVo.setMessage("手机号解析失败");
+                // 日志
+                logObj.setRes(JSONUtil.toJsonStr(baseVo));
+                logObj.setTimeConsuming(Long.toString(System.currentTimeMillis() - startTime));
+                payLogService.save(logObj);
+                return baseVo;
+            }
+        }
+        WalletManageVo userWallet = walletService.getWalletByUserPhone(userPhone, WalletTypeEnum.PAY).getData();
         if (ObjectUtil.isEmpty(userWallet)) {
             baseVo.set(ThirdPayVoStatusEnum.USER_EXIST);
             // 日志
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/doc/第三方支付文档.wps b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/doc/第三方支付文档.wps
index f6e3916d1aaaa2fd32fdb914d8c55867047a14ef..1b0f1b492ba5d5505222e2666372c226e171e562 100644
GIT binary patch
delta 11489
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
U5Nbbz|34ks*5g?Lw{3m=KSjO9=Kufz

delta 10784
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

diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
index 1d5fbfee3..13a360058 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
@@ -29,8 +29,8 @@ import java.util.Map;
 @SpringBootTest(classes = ThirdPartyApp.class)
 public class PayTest {
 
-    private final String baseUrl = "http://123.156.230.15:8089/api";
-    // private final String baseUrl = "http://127.0.0.1:9999";
+    // private final String baseUrl = "http://123.156.230.15:8089/api";
+    private final String baseUrl = "http://127.0.0.1:9999";
 
     private final String walletInfoUrl = "/third/third-pay-api/user-wallet";
 
@@ -63,6 +63,7 @@ public class PayTest {
         ThirdKeyManageEntity config = getLbConfig();
         Map<String, Object> paramsMap = new HashMap<>();
         paramsMap.put("signPhone", LbRetailSignUtils.sm4Encrypt("17683843141", config.getFieldKey()));
+        // paramsMap.put("userId", 1875049673022279681L);
         String body = JSONUtil.toJsonStr(paramsMap);
         // 发送请求
         String res = HttpRequest.post(baseUrl + walletInfoUrl).contentType("application/json").header(apiCountersign(body)).body(body).execute().body();
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java
index 72e4ee651..4d32b7176 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java
@@ -2,9 +2,7 @@ package com.bsd.pjcloud.wallet.mapper;
 
 import cn.hutool.core.util.ObjectUtil;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.wallet.api.dto.MchManageDto;
@@ -47,16 +45,5 @@ public interface MchManageMapper extends PjcloudBaseMapper<MchManageEntity> {
 
     List<MchManageVo> scopeList(@Param("dto") MchManageDto dto, DataScope dataScope);
 
-    Page<MchManageVo> scopePageList(Page page, @Param("dto") MchManageDto dto, DataScope dataScope);
-
-    default List<MchManageEntity> scopeList(MchManageDto dto) {
-        LambdaQueryWrapper<MchManageEntity> wrapper = new LambdaQueryWrapper<MchManageEntity>()
-                .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName())
-                .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds())
-                .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds())
-                .orderByDesc(MchManageEntity::getSort)
-                .orderByDesc(MchManageEntity::getCreateTime)
-                .orderByDesc(MchManageEntity::getId);
-        return selectListByScope(wrapper, DataScope.of());
-    }
+    Page<MchManageVo> scopePageList(@Param("dto") MchManageDto dto, Page page, DataScope dataScope);
 }
\ No newline at end of file
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java
index d8ee888c7..2c7303678 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchManageServiceImpl.java
@@ -215,7 +215,7 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
 
     @Override
     public Page<MchManageVo> scopePageList(Page page, MchManageDto dto, DataScope dataScope) {
-        Page<MchManageVo> list = baseMapper.scopePageList(page, dto, dataScope);
+        Page<MchManageVo> list = baseMapper.scopePageList(dto, page, dataScope);
         if (ObjectUtil.isNotEmpty(list.getRecords())) {
             // 部门
             List<Long> deptIds = list.getRecords().stream().map(MchManageVo::getDeptId).distinct().toList();