Browse Source

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

魏超 5 years ago
parent
commit
aa7a35b1b4

+ 1
- 1
src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java View File

405
      * 企业认证回调函数
405
      * 企业认证回调函数
406
      *
406
      *
407
      */
407
      */
408
-    @RequestMapping(value = "/fadd/company", method = RequestMethod.GET)
408
+    @RequestMapping(value = "/fadd/company", method = RequestMethod.POST)
409
     public void faddCompanyNitify(@RequestParam String companyName,
409
     public void faddCompanyNitify(@RequestParam String companyName,
410
                                   @RequestParam String transactionNo,
410
                                   @RequestParam String transactionNo,
411
                                   @RequestParam String authenticationType,
411
                                   @RequestParam String authenticationType,

+ 1
- 1
src/main/java/com/huiju/estateagents/eContract/controller/TaContractUserController.java View File

28
  * @since 2020-03-26
28
  * @since 2020-03-26
29
  */
29
  */
30
 @RestController
30
 @RestController
31
-@RequestMapping("/")
31
+@RequestMapping("/api")
32
 public class TaContractUserController extends BaseController {
32
 public class TaContractUserController extends BaseController {
33
 
33
 
34
     private final Logger logger = LoggerFactory.getLogger(TaContractUserController.class);
34
     private final Logger logger = LoggerFactory.getLogger(TaContractUserController.class);

+ 6
- 3
src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java View File

24
 import org.springframework.stereotype.Service;
24
 import org.springframework.stereotype.Service;
25
 
25
 
26
 import java.time.LocalDateTime;
26
 import java.time.LocalDateTime;
27
+import java.time.format.DateTimeFormatter;
27
 
28
 
28
 /**
29
 /**
29
  * <p>
30
  * <p>
159
                 taCompany.setCreditCode(companyJson.getString("organization"));
160
                 taCompany.setCreditCode(companyJson.getString("organization"));
160
                 taCompany.setStatus(companyJson.getInteger("status"));
161
                 taCompany.setStatus(companyJson.getInteger("status"));
161
                 taCompany.setReason(companyJson.getString("auditFailReason"));
162
                 taCompany.setReason(companyJson.getString("auditFailReason"));
162
-                taCompany.setVerifyTime(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(companyJson.getString("auditorTime")));
163
+
164
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.s");
165
+                taCompany.setVerifyTime(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(companyJson.getString("auditorTime"),df));
163
             }
166
             }
164
 
167
 
165
             //银行卡信息
168
             //银行卡信息
166
-            JSONObject bankJson = dataJson.getJSONObject("company");
169
+            JSONObject bankJson = dataJson.getJSONObject("bankCard");
167
             if (null != bankJson){
170
             if (null != bankJson){
168
-                taCompany.setBankName(bankJson.getString("BankName"));
171
+                taCompany.setBankName(bankJson.getString("bankName"));
169
                 taCompany.setSubbranchName(bankJson.getString("bankDetailName"));
172
                 taCompany.setSubbranchName(bankJson.getString("bankDetailName"));
170
                 taCompany.setBankAccount(bankJson.getString("bankCardNo"));
173
                 taCompany.setBankAccount(bankJson.getString("bankCardNo"));
171
             }
174
             }