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

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -405,7 +405,7 @@ public class TaCompanyController extends BaseController {
      * 企业认证回调函数
      *
      */
-    @RequestMapping(value = "/fadd/company", method = RequestMethod.GET)
+    @RequestMapping(value = "/fadd/company", method = RequestMethod.POST)
     public void faddCompanyNitify(@RequestParam String companyName,
                                   @RequestParam String transactionNo,
                                   @RequestParam String authenticationType,

src/main/java/com/huiju/estateagents/eContract/controller/TaContractUserController.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @since 2020-03-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaContractUserController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaContractUserController.class);

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * <p>
@@ -159,13 +160,15 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
                 taCompany.setCreditCode(companyJson.getString("organization"));
                 taCompany.setStatus(companyJson.getInteger("status"));
                 taCompany.setReason(companyJson.getString("auditFailReason"));
-                taCompany.setVerifyTime(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(companyJson.getString("auditorTime")));
+
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.s");
+                taCompany.setVerifyTime(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(companyJson.getString("auditorTime"),df));
             }
 
             //银行卡信息
-            JSONObject bankJson = dataJson.getJSONObject("company");
+            JSONObject bankJson = dataJson.getJSONObject("bankCard");
             if (null != bankJson){
-                taCompany.setBankName(bankJson.getString("BankName"));
+                taCompany.setBankName(bankJson.getString("bankName"));
                 taCompany.setSubbranchName(bankJson.getString("bankDetailName"));
                 taCompany.setBankAccount(bankJson.getString("bankCardNo"));
             }