傅行帆 преди 5 години
родител
ревизия
3f9b460d40

+ 5
- 1
src/main/java/com/huiju/estateagents/eContract/controller/TaContractUserController.java Целия файл

11
 import com.huiju.estateagents.entity.TaPerson;
11
 import com.huiju.estateagents.entity.TaPerson;
12
 import com.huiju.estateagents.entity.TaRaiseRecord;
12
 import com.huiju.estateagents.entity.TaRaiseRecord;
13
 import com.huiju.estateagents.service.ITaPersonService;
13
 import com.huiju.estateagents.service.ITaPersonService;
14
+import com.huiju.estateagents.service.ITaRaiseRecordService;
14
 import org.slf4j.Logger;
15
 import org.slf4j.Logger;
15
 import org.slf4j.LoggerFactory;
16
 import org.slf4j.LoggerFactory;
16
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.beans.factory.annotation.Autowired;
40
     @Autowired
41
     @Autowired
41
     public ITaPersonService taPersonService;
42
     public ITaPersonService taPersonService;
42
 
43
 
44
+    @Autowired
45
+    private ITaRaiseRecordService taRaiseRecordService;
46
+
43
     /**
47
     /**
44
      * 分页查询列表
48
      * 分页查询列表
45
      * @param pageNum
49
      * @param pageNum
166
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
170
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
167
             }
171
             }
168
             TaPerson person = taPersons.get(0);
172
             TaPerson person = taPersons.get(0);
169
-            TaContractUser taContractUser = iTaContractUserService.newFirstCustomerInfo(person,taRaiseRecord);
173
+            TaContractUser taContractUser = iTaContractUserService.newFirstCustomerInfo(person,taRaiseRecordService.getById(taRaiseRecord.getRaiseRecordId()));
170
             responseBean.addSuccess(taContractUser);
174
             responseBean.addSuccess(taContractUser);
171
         } catch (Exception e) {
175
         } catch (Exception e) {
172
             e.printStackTrace();
176
             e.printStackTrace();

+ 3
- 3
src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java Целия файл

251
      */
251
      */
252
     private String getFddServerHost(String miniappId,String subUrl) {
252
     private String getFddServerHost(String miniappId,String subUrl) {
253
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
253
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
254
-        int index = subUrl.indexOf(File.separator);
255
-        int twoIndex = subUrl.indexOf(File.separator,index);
256
-        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
254
+        int index = subUrl.indexOf("/");
255
+        int twoIndex = subUrl.indexOf("/",index+1);
256
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
257
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
257
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
258
         return newUrl;
258
         return newUrl;
259
     }
259
     }

+ 3
- 3
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java Целия файл

179
      */
179
      */
180
     private String getFddServerHost(String miniappId,String subUrl) {
180
     private String getFddServerHost(String miniappId,String subUrl) {
181
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
181
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
182
-        int index = subUrl.indexOf(File.separator);
183
-        int twoIndex = subUrl.indexOf(File.separator,index);
184
-        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
182
+        int index = subUrl.indexOf("/");
183
+        int twoIndex = subUrl.indexOf("/",index+1);
184
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
185
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
185
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
186
         return newUrl;
186
         return newUrl;
187
     }
187
     }

+ 6
- 5
src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java Целия файл

61
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
61
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
62
         if (null != taContractUser) {
62
         if (null != taContractUser) {
63
             taContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
63
             taContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
64
+            taContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),taContractUser.getCertifiedAddress()));
64
             return taContractUser;
65
             return taContractUser;
65
         }
66
         }
66
         //没有法大大账号的先注册
67
         //没有法大大账号的先注册
91
         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(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
92
         String customer_id = jsonObject.getString("data");
93
         String customer_id = jsonObject.getString("data");
93
         //0:三要素标准方案; 1:三要素补充方案;
94
         //0:三要素标准方案; 1:三要素补充方案;
94
-        String verifyed_way = "0";
95
+        String verifyed_way = "1";
95
         String page_modify = "1";
96
         String page_modify = "1";
96
         String notify_url = fadadaProperties.getCompanyNotify();
97
         String notify_url = fadadaProperties.getCompanyNotify();
97
         String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
98
         String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
98
         String customer_ident_type = "0";
99
         String customer_ident_type = "0";
99
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
100
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
100
                 page_modify,notify_url,return_url,null,customer_ident_type,
101
                 page_modify,notify_url,return_url,null,customer_ident_type,
101
-                null,null,null,"1","1");
102
+                taRaiseRecord.getIdcard(),taRaiseRecord.getTel(),null,"1","1");
102
 
103
 
103
         String data = JSON.parseObject(personResult).getString("data");
104
         String data = JSON.parseObject(personResult).getString("data");
104
         if (null !=data){
105
         if (null !=data){
120
      */
121
      */
121
     private String getFddServerHost(String miniappId,String subUrl) {
122
     private String getFddServerHost(String miniappId,String subUrl) {
122
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
123
         TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
123
-        int index = subUrl.indexOf(File.separator);
124
-        int twoIndex = subUrl.indexOf(File.separator,index);
125
-        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
124
+        int index = subUrl.indexOf("/");
125
+        int twoIndex = subUrl.indexOf("/",index+1);
126
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
126
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
127
         String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
127
         return newUrl;
128
         return newUrl;
128
     }
129
     }