Merge remote-tracking branch 'origin/develop' into develop

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

@@ -26,7 +26,7 @@ public interface XzService {
 
     String xzAuthNotify(JSONObject notify);
 
-    String getSignedResult(XzAuthVO xzAuthVO);
+    JSONObject getSignedResult(XzAuthVO xzAuthVO);
 
     String viewContract(String documentId);
 

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

@@ -4,12 +4,15 @@ import cn.hutool.core.codec.Base64;
 import cn.hutool.core.net.URLDecoder;
 import cn.hutool.json.JSONObject;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.mmc.iuav.general.CodeUtil;
 import com.mmc.iuav.http.HttpsRequestUtil;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.constant.UserSystemConstant;
+import com.mmc.iuav.user.dao.RealNameAuthDao;
 import com.mmc.iuav.user.dao.wallet.PayWalletDao;
 import com.mmc.iuav.user.dao.xzsz.XzDao;
+import com.mmc.iuav.user.entity.RealNameAuthDO;
 import com.mmc.iuav.user.entity.XzAuthDO;
 import com.mmc.iuav.user.entity.XzWithdrawalApplyDO;
 import com.mmc.iuav.user.entity.wallet.PayWalletDO;
@@ -49,6 +52,7 @@ import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -67,6 +71,9 @@ public class XzServiceImpl implements XzService {
     @Resource
     private PayWalletDao payWalletDao;
 
+    @Autowired
+    private RealNameAuthDao realNameAuthDao;
+
     @Override
     public ResultBody getTaxFundList() {
         PiggyOpenBasicsClient piggyOpenBasicsClient = PiggyOpenBasicsClient.getInstanse(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzDomain());
@@ -117,23 +124,34 @@ public class XzServiceImpl implements XzService {
         com.alibaba.fastjson2.JSONObject jsonObject1 = com.alibaba.fastjson2.JSONObject.parseObject(contractScope);
         if (jsonObject1.get("data") != null) {
             // TODO 添加认证结果
-            String signedResult = this.getSignedResult(xzAuthVO);
-
-            return "合同签署完毕";
+            JSONObject signedResult = this.getSignedResult(xzAuthVO);
+            if (signedResult.get("msg").equals("success")) {
+                log.info("Signed result: {}", signedResult);
+                List<JSONObject> jsonObjects = JSONArray.parseArray(signedResult.get("data").toString(), JSONObject.class);
+                log.info("jsonObjects : {}", com.alibaba.fastjson2.JSONObject.toJSONString(jsonObjects));
+            }
+            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());
             JSONObject jsonObject = piggySignApiClient.getSignUrl(PiggySignVo.builder()
                     .appKey(userSystemConstant.getXzAppKey())
                     .customParams(com.alibaba.fastjson2.JSONObject.toJSONString(userInfo))
-                    .idCardNo(xzAuthVO.getIdCardNo())
+                    .idCardNo(realNameAuthDO.getIdNumber())
                     .infoSource("1")
-                    .jumpPage("https://wwww.baidu.com")
-                    .mobile(xzAuthVO.getMobile())
+                    .jumpPage("https://www.signtest.cn/signSuccess")
+                    .mobile(loginSuccessDTO.getPhoneNum())
                     .notifyUrl(userSystemConstant.getAuthNotify())
                     .position(userSystemConstant.getXzPosition())
-                    .userName(xzAuthVO.getUsername())
+                    .userName(realNameAuthDO.getUserName())
+                    .idCardImageFront(realNameAuthDO.getFrontIdImg())
+                    .idCardImageBack(realNameAuthDO.getBackIdImg())
                     .build());
             // TODO 发送模板消息
             return jsonObject.get("data").toString();
@@ -165,7 +183,7 @@ public class XzServiceImpl implements XzService {
     }
 
     @Override
-    public String getSignedResult(XzAuthVO xzAuthVO) {
+    public JSONObject getSignedResult(XzAuthVO xzAuthVO) {
         PiggySignApiClient piggySignApiClient = PiggySignApiClient.getInstanse(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzDomain());
         JSONObject jsonObject = piggySignApiClient.getSignResult(PiggySignResultVo.builder()
                 .appKey(userSystemConstant.getXzAppKey())
@@ -173,7 +191,7 @@ public class XzServiceImpl implements XzService {
                 .userName(xzAuthVO.getUsername())
                 .build());
         System.out.println(jsonObject.toString());
-        return jsonObject.toString();
+        return jsonObject;
     }
 
     @Override

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -70,12 +70,18 @@ third-party:
     app-key: 5015e664848d406ab1ca4b505c3da803
     secret-key: 7C4DB8CCECC148175E46392CC0A1B410
   xzsz:
-    appKey: 1e8e59e056be41f8a05c090964d7ce37
-    appSecret: ceshihuanjingyanshizhanghao00000
+    #    appKey: 1e8e59e056be41f8a05c090964d7ce37
+    #    appSecret: ceshihuanjingyanshizhanghao00000
+    #    aes: 0000000000000000
+    #    domain: https://uat.xzsz.ltd/
+    #    position: 销售推广
+    #    taxFundId: xxxxxxxxxxxxxxxxxxxxxxx
+    appKey: 37f76305f1864339adc8d6d03fbf918d
+    appSecret: hangzhouyunxiangfeikeji000000000
     aes: 0000000000000000
-    domain: https://uat.xzsz.ltd/
-    position: 销售推广
-    taxFundId: xxxxxxxxxxxxxxxxxxxxxxx
+    domain: https://saas.xzsz.ltd
+    position: 市场推广
+    taxFundId: 0b0376083af4435885bd5d5cd3d63053
     authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
     withdrawNotify: https://test.iuav.shop/userapp/xz/xzWithdrawNotify
 

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -48,6 +48,12 @@ third-party:
     authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
     withdrawNotify: https://test.iuav.shop/userapp/xz/xzWithdrawNotify
 
+fdd:
+  appid: 407664
+  appkey: q146q3Cjmi7Y6BVl8jtZK9pH
+  version: 2
+  host: https://testapi.fadada.com:8443/api/
+  mmc-url: https://test.iuav.shop/userapp/
 
 iuav:
   pay:

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 3e134fb9e8e1e4215cd7079a060d1314e5692a5c
+  newTag: d96fffe3d794c52d19a2ad898288875744c479df