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

core/src/main/java/com/hand/app/esignHclc/dto/SignUserInfoHclc.java

@@ -58,6 +58,10 @@ public class SignUserInfoHclc extends BaseDTO {
 
     private String  managerAuthFlag; // 管理员授权状态
 
+    private String openIdNew;
+
+    private String openIdBak;
+
     @Transient
     private String attachmentId;//身份证附件id
 
@@ -408,4 +412,20 @@ public class SignUserInfoHclc extends BaseDTO {
     public void setOldOpenId(String oldOpenId) {
         this.oldOpenId = oldOpenId;
     }
+
+    public String getOpenIdBak() {
+        return openIdBak;
+    }
+
+    public void setOpenIdBak(String openIdBak) {
+        this.openIdBak = openIdBak;
+    }
+
+    public String getOpenIdNew() {
+        return openIdNew;
+    }
+
+    public void setOpenIdNew(String openIdNew) {
+        this.openIdNew = openIdNew;
+    }
 }

core/src/main/java/com/hand/app/esignHclc/dto/SignUserInfoHclcHis.java

@@ -120,6 +120,10 @@ public class SignUserInfoHclcHis extends BaseDTO {
     @Transient
     private Long orgAttachmentId;
 
+    private String openIdNew;
+
+    private String openIdBak;
+
 
     public void setHisId(Long hisId) {
         this.hisId = hisId;
@@ -329,4 +333,19 @@ public class SignUserInfoHclcHis extends BaseDTO {
         return authFlag;
     }
 
+    public String getOpenIdNew() {
+        return openIdNew;
+    }
+
+    public void setOpenIdNew(String openIdNew) {
+        this.openIdNew = openIdNew;
+    }
+
+    public String getOpenIdBak() {
+        return openIdBak;
+    }
+
+    public void setOpenIdBak(String openIdBak) {
+        this.openIdBak = openIdBak;
+    }
 }

core/src/main/java/com/hand/app/esignHclc/service/impl/SignInfoHclcServiceImpl.java

@@ -751,9 +751,9 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
                 //身份证ocr认证
                 SignHclcUtils signHclcUtils = new SignHclcUtils();
                 if ("app_file_id_card".equalsIgnoreCase(attachmentInfo.getSourceType())) {
-                    //json = signHclcUtils.idcard(bytes);
-                    String  img = Base64.encodeBase64String(bytes);
-                    json = this.idcard(iRequest, img);
+                    json = signHclcUtils.idcard(bytes);
+//                    String  img = Base64.encodeBase64String(bytes);
+//                    json = this.idcard(iRequest, img);
                 } else if ("app_file_id_bank".equalsIgnoreCase(attachmentInfo.getSourceType())) {
                     json = signHclcUtils.bankcard(bytes);
 //                    img = Base64.encodeBase64String(bytes);
@@ -1304,7 +1304,7 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
         //创建内部用户返回的天印签章系统的用户id
         result.put("accountId", accountId);
         //用户的唯一标识可以为客户业务系统内唯一标识
-        result.put("uniqueId", signInfoHclc.getOpenId());
+        result.put("uniqueId", Objects.nonNull(signInfoHclc.getOpenIdBak()) ? signInfoHclc.getOpenIdBak() : signInfoHclc.getOpenId());
         JSONObject json = new JSONObject(result);
         String param = json.toString();
 
@@ -1417,12 +1417,12 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
                 //用户类型是个人时
                 if (signInfoHclc.getCtitype().compareTo(1L) == 0) {
                     json1.put("accountId", signInfoHclc.getAccountId());
-                    json1.put("uniqueId", signInfoHclc.getOpenId().replace("personHclc", ""));
+                    json1.put("uniqueId", Objects.nonNull(signInfoHclc.getOpenIdBak()) ? signInfoHclc.getOpenIdBak() : signInfoHclc.getOpenId().replace("personHclc", ""));
                     //用户类型是机构时
                 } else {
                     json1.put("accountId", signInfoHclc.getAgentAccountId());
                     json1.put("authorizationOrganizeId", signInfoHclc.getAccountId());
-                    json1.put("uniqueId", signInfoHclc.getOpenId());
+                    json1.put("uniqueId", Objects.nonNull(signInfoHclc.getOpenIdBak()) ? signInfoHclc.getOpenIdBak() : signInfoHclc.getOpenId());
                 }
 
                 //获取需要发送微信通知的签署人
@@ -1575,8 +1575,14 @@ public class SignInfoHclcServiceImpl extends BaseServiceImpl<SignUserInfoHclc> i
 //                    } else {
                     //根据uniqueId获取用户信息
                     SignUserInfoHclc signInfoHclc = new SignUserInfoHclc();
-                    signInfoHclc.setOpenId(signUrl.getString("uniqueId"));
-                    signInfoHclc = this.selectByPrimaryKey(requestContext, signInfoHclc);
+                    signInfoHclc.setOpenIdBak(signUrl.getString("uniqueId"));
+                    List<SignUserInfoHclc> signUserInfoHclcs = signInfoHclcMapper.select(signInfoHclc);
+                    if (Objects.nonNull(signUserInfoHclcs) && signUserInfoHclcs.size() > 0) {
+                        signInfoHclc = signUserInfoHclcs.get(0);
+                    } else {
+                        signInfoHclc.setOpenId(signUrl.getString("uniqueId"));
+                        signInfoHclc = this.selectByPrimaryKey(requestContext, signInfoHclc);
+                    }
 
                     if (signInfoHclc.getCtitype().compareTo(2L) == 0 && !signUrl.getString("signUrl").contains("organizeId")) {
                         SignUserInfoHclc signInfoHclcP = new SignUserInfoHclc();