小猪结算签约修改

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/XzAuthVO.java

@@ -30,4 +30,5 @@ public class XzAuthVO implements Serializable {
     private String idCardImageFront;
     @ApiModelProperty(value = "身份证照片国徽面URL，图片必须已经通过OCR识别")
     private String idCardImageBack;
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/XzService.java

@@ -22,7 +22,7 @@ public interface XzService {
 
     String getContractScope(XzAuthVO xzAuthVO);
 
-    String hasKeyByUrl(XzAuthVO xzAuthVO, LoginSuccessDTO loginSuccessDTO);
+    String hasKeyByUrl(LoginSuccessDTO loginSuccessDTO);
 
     String xzAuthNotify(JSONObject notify);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java

@@ -118,7 +118,14 @@ public class XzServiceImpl implements XzService {
     }
 
     @Override
-    public String hasKeyByUrl(XzAuthVO xzAuthVO, LoginSuccessDTO loginSuccessDTO) {
+    public String hasKeyByUrl(LoginSuccessDTO loginSuccessDTO) {
+        // 获取实名认证信息
+        RealNameAuthDO realNameAuthDO = realNameAuthDao.getRealNameAuthByUId(loginSuccessDTO.getUserAccountId());
+        if (realNameAuthDO == null) {
+            return "先完成实名认证再签署！";
+        }
+        XzAuthVO xzAuthVO = new XzAuthVO(realNameAuthDO.getUserName(), realNameAuthDO.getIdNumber(),
+                loginSuccessDTO.getPhoneNum(), null, realNameAuthDO.getFrontIdImg(), realNameAuthDO.getBackIdImg());
         // TODO 查询是否已认证
         String contractScope = this.getContractScope(xzAuthVO);
         com.alibaba.fastjson2.JSONObject jsonObject1 = com.alibaba.fastjson2.JSONObject.parseObject(contractScope);
@@ -132,11 +139,6 @@ public class XzServiceImpl implements XzService {
             }
             return signedResult.toString();
         } else {
-            // 获取认证信息
-            RealNameAuthDO realNameAuthDO = realNameAuthDao.getRealNameAuthByUId(loginSuccessDTO.getUserAccountId());
-            if (realNameAuthDO == null) {
-                return "先完成实名认证再签署！";
-            }
             Map<String, Integer> userInfo = new HashMap<String, Integer>();
             userInfo.put("userAccountId", loginSuccessDTO.getUserAccountId());
             PiggySignApiClient piggySignApiClient = PiggySignApiClient.getInstanse(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzDomain());