傅行帆 5 gadus atpakaļ
vecāks
revīzija
1ce170632f

+ 5
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java Parādīt failu

801
     public static final String AUTO_AUTH_STATUS = "3000";
801
     public static final String AUTO_AUTH_STATUS = "3000";
802
 
802
 
803
     public static final String  AUTH_SUCCESS_DESC = "签章成功";
803
     public static final String  AUTH_SUCCESS_DESC = "签章成功";
804
+
805
+    /**
806
+     * 审核通过
807
+     */
808
+    public static final Integer STATUS_VERIFY_PASS = 4;
804
 }
809
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java Parādīt failu

409
             JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
409
             JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
410
             for (Object id : jsonArray) {
410
             for (Object id : jsonArray) {
411
                 TaCompany company = iTaCompanyService.getById((Integer) id);
411
                 TaCompany company = iTaCompanyService.getById((Integer) id);
412
-                if (CommConstant.STATUS_UNACCALIMED.equals(company.getStatus())){
412
+                if (!CommConstant.STATUS_VERIFY_PASS.equals(company.getStatus())){
413
                     company.setStatus(CommConstant.STATUS_DELETE);
413
                     company.setStatus(CommConstant.STATUS_DELETE);
414
                     iTaCompanyService.updateById(company);
414
                     iTaCompanyService.updateById(company);
415
                     successNum++;
415
                     successNum++;

+ 2
- 2
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java Parādīt failu

139
         taContractMapper.insert(taContract);
139
         taContractMapper.insert(taContract);
140
 
140
 
141
         //上传合同
141
         //上传合同
142
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
142
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
143
         String result = base.invokeUploadDocs(taContract.getContractId().toString(), taContractBusiness.getContractTemplateName(), null, taContractBusiness.getContractTemplateAddress(), ".pdf");
143
         String result = base.invokeUploadDocs(taContract.getContractId().toString(), taContractBusiness.getContractTemplateName(), null, taContractBusiness.getContractTemplateAddress(), ".pdf");
144
         JSONObject jsonObject = JSONObject.parseObject(result);
144
         JSONObject jsonObject = JSONObject.parseObject(result);
145
         if (!jsonObject.getString("code").equals("1000")){
145
         if (!jsonObject.getString("code").equals("1000")){
213
         String timeStamp = HttpsUtil.getTimeStamp();
213
         String timeStamp = HttpsUtil.getTimeStamp();
214
         String transaction_id = "TRAN_" + timeStamp;
214
         String transaction_id = "TRAN_" + timeStamp;
215
 
215
 
216
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
216
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
217
         ExtsignReq req = new ExtsignReq();
217
         ExtsignReq req = new ExtsignReq();
218
         req.setCustomer_id(taContractUser.getFadadaCode());
218
         req.setCustomer_id(taContractUser.getFadadaCode());
219
         req.setTransaction_id(transaction_id);
219
         req.setTransaction_id(transaction_id);

+ 3
- 3
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java Parādīt failu

67
         //没有法大大账号的先注册
67
         //没有法大大账号的先注册
68
         log.info("========法大大个人注册=======");
68
         log.info("========法大大个人注册=======");
69
         //在法大大注册个人用户
69
         //在法大大注册个人用户
70
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
70
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
71
         //小程序open——id为注册账号
71
         //小程序open——id为注册账号
72
         String open_id = person.getMiniOpenid();
72
         String open_id = person.getMiniOpenid();
73
         //account_type 1是个人注册
73
         //account_type 1是个人注册
89
         newContractUser.setOrgId(CommConstant.STATUS_UNACCALIMED);
89
         newContractUser.setOrgId(CommConstant.STATUS_UNACCALIMED);
90
 
90
 
91
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
91
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
92
-        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
92
+        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
93
         String customer_id = jsonObject.getString("data");
93
         String customer_id = jsonObject.getString("data");
94
         //0:三要素标准方案; 1:三要素补充方案;
94
         //0:三要素标准方案; 1:三要素补充方案;
95
         String verifyed_way = "1";
95
         String verifyed_way = "1";
141
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
141
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
142
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
142
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
143
         log.info("个人正在从法大大获取最新数据,企业编号是 {}", taContractUser.getFadadaCode());
143
         log.info("个人正在从法大大获取最新数据,企业编号是 {}", taContractUser.getFadadaCode());
144
-        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
144
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
145
         String verified_serialno = taContractUser.getCertifiedSerialNumber();
145
         String verified_serialno = taContractUser.getCertifiedSerialNumber();
146
         String result = personCertInfo.invokeFindPersonCert(verified_serialno,
146
         String result = personCertInfo.invokeFindPersonCert(verified_serialno,
147
                 "1");
147
                 "1");