Merge remote-tracking branch 'origin/master'

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/pay/ThirdPayApiServiceImpl.java

@@ -185,7 +185,7 @@ public class ThirdPayApiServiceImpl implements ThirdPayApiService {
         String userPhone = null;
         // 判断是根据手机号查询还是根据用户id查询
         if (ObjectUtil.isNotEmpty(dto.getUserId())) {
-            UserInfo userInfo = userService.getByUserId(dto.getUserId()).getData();
+            UserInfo userInfo = userService.getInnerByUserId(dto.getUserId()).getData();
             if (ObjectUtil.isEmpty(userInfo)) {
                 baseVo.set(ThirdPayVoStatusEnum.USER_EXIST);
                 // 日志
@@ -220,7 +220,7 @@ public class ThirdPayApiServiceImpl implements ThirdPayApiService {
         }
         PayWalletInfoVo result = new PayWalletInfoVo();
         result.setUserId(userWallet.getUserId());
-        result.setSignPhone(dto.getSignPhone());
+        result.setSignPhone(LbRetailSignUtils.sm4Encrypt(userPhone, keySetting.getFieldKey()));
         result.setBalance(userWallet.getBalance());
         result.setName(userWallet.getUsername());
         // 返回成功的参数

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java

@@ -62,7 +62,8 @@ public class PayTest {
     public void walletInfo() throws Exception {
         ThirdKeyManageEntity config = getLbConfig();
         Map<String, Object> paramsMap = new HashMap<>();
-        paramsMap.put("signPhone", LbRetailSignUtils.sm4Encrypt("17683843141", config.getFieldKey()));
+        // paramsMap.put("signPhone", LbRetailSignUtils.sm4Encrypt("17683843141", config.getFieldKey()));
+        // paramsMap.put("signPhone", "8KKubCKESDN5TlUl3i0HaQ==");
         // paramsMap.put("userId", 1875049673022279681L);
         String body = JSONUtil.toJsonStr(paramsMap);
         // 发送请求