企业数据相关

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.eContract.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,6 +11,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.sample.entity.TaH5Demand;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +27,9 @@ import com.huiju.estateagents.eContract.entity.TaCompany;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -219,7 +223,7 @@ public class TaCompanyController extends BaseController {
      * @param pageSize
      * @param companyName
      * @param companyCode
-     * @param certifiedStatus
+     * @param status
      * @return
      */
     @RequestMapping(value = "/channel/company/list", method = RequestMethod.GET)
@@ -227,7 +231,7 @@ public class TaCompanyController extends BaseController {
                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "companyName", required = false) String companyName,
                                        @RequestParam(value = "companyCode", required = false) String companyCode,
-                                       @RequestParam(value = "certifiedStatus", required = false) String certifiedStatus) {
+                                       @RequestParam(value = "certifiedStatus", required = false) String status) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -235,8 +239,8 @@ public class TaCompanyController extends BaseController {
             QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
             queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
-            queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
-            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -303,4 +307,55 @@ public class TaCompanyController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id去法大大那边拿最新数据然后更新
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/company/fdd/{id}", method = RequestMethod.GET)
+    public ResponseBean updateCompanyInfoByFdd(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaCompany newCompany = iTaCompanyService.updateCompanyInfoByFdd(id);
+            responseBean.addSuccess(newCompany);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id更新数据
+     *
+     * @param
+     */
+    @RequestMapping(value = "/channel/company/delete", method = RequestMethod.DELETE)
+    public ResponseBean updateCompanyInfo(@RequestBody String ids) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            int successNum = 0;
+            int failNum = 0;
+            JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
+            for (Object id : jsonArray) {
+                TaCompany company = iTaCompanyService.getById((Integer) id);
+                if (CommConstant.STATUS_UNACCALIMED.equals(company.getStatus())){
+                    company.setStatus(CommConstant.STATUS_DELETE);
+                    iTaCompanyService.updateById(company);
+                    successNum++;
+                }else{
+                    failNum++;
+                }
+            }
+            Map<String,Object> map = new HashMap<>();
+            map.put("successNum",successNum);
+            map.put("failNum",failNum);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/eContract/entity/TaCompany.java

@@ -78,7 +78,7 @@ public class TaCompany implements Serializable {
     /**
      * 认证方式 认证方式
      */
-    private String certifiedType;
+    private Integer certifiedType;
 
     /**
      * 创建时间

src/main/java/com/huiju/estateagents/eContract/service/ITaCompanyService.java

@@ -26,4 +26,11 @@ public interface ITaCompanyService extends IService<TaCompany> {
      * @return
      */
     TaCompany updateCompanyInfo(TaCompany taCompany) throws Exception;
+
+    /**
+     * 向法大大获取最新的企业认证数据
+     * @param id
+     * @return
+     */
+    TaCompany updateCompanyInfoByFdd(Integer id) throws Exception;
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.eContract.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fadada.sdk.client.FddClientBase;
+import com.fadada.sdk.client.authForfadada.FindCertInfo;
 import com.fadada.sdk.client.authForfadada.GetCompanyVerifyUrl;
 import com.fadada.sdk.client.authForfadada.model.AgentInfoINO;
 import com.fadada.sdk.client.authForfadada.model.BankInfoINO;
@@ -10,6 +11,7 @@ import com.fadada.sdk.client.authForfadada.model.CompanyInfoINO;
 import com.fadada.sdk.client.authForfadada.model.LegalInfoINO;
 import com.fadada.sdk.util.http.HttpsUtil;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.entity.TaCompany;
 import com.huiju.estateagents.eContract.mapper.TaCompanyMapper;
@@ -66,7 +68,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         taCompany.setFadadaCode(jsonObject.getString("data"));
         taCompany.setCertifiedStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
         taCompany.setCreateDate(LocalDateTime.now());
-        taCompany.setStatus(CommConstant.STATUS_NORMAL);
+        taCompany.setStatus(CommConstant.STATUS_UNACCALIMED);
         taCompanyMapper.insert(taCompany);
         return taCompany;
     }
@@ -128,6 +130,59 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         return taCompany;
     }
 
+    /**
+     * 向法大大获取最新的企业认证数据
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public TaCompany updateCompanyInfoByFdd(Integer id) throws Exception {
+        TaCompany taCompany = taCompanyMapper.selectById(id);
+        log.info("企业正在从法大大获取最新数据，企业编号是 {}", taCompany.getFadadaCode());
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String verified_serialno = taCompany.getCertifiedSerialNumber();
+        String result = personCertInfo.invokeFindPersonCert(verified_serialno, CommConstant.ACCOUNT_TYPE_COMPANY);
+        log.info("企业最新数据结果 {}",result);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (jsonObject.getInteger("code") != 1){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+        //更新数据
+        String data = jsonObject.getString("data");
+        if (null !=data){
+            JSONObject dataJson = JSONObject.parseObject(data);
+            //账户信息
+            JSONObject companyJson = dataJson.getJSONObject("company");
+            if (null != companyJson){
+                taCompany.setCompanyName(companyJson.getString("companyName"));
+                taCompany.setCertifiedType(companyJson.getInteger("verifyType"));
+                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")));
+            }
+
+            //银行卡信息
+            JSONObject bankJson = dataJson.getJSONObject("company");
+            if (null != bankJson){
+                taCompany.setBankName(bankJson.getString("BankName"));
+                taCompany.setSubbranchName(bankJson.getString("bankDetailName"));
+                taCompany.setBankAccount(bankJson.getString("bankCardNo"));
+            }
+
+            //企业法人、代理人信息
+            JSONObject managerJson = dataJson.getJSONObject("manager");
+            if (null != managerJson){
+                taCompany.setUserName(managerJson.getString("personName"));
+                taCompany.setTel(managerJson.getString("mobile"));
+                taCompany.setIdCard(managerJson.getString("idCard"));
+            }
+        }
+        taCompanyMapper.updateById(taCompany);
+        return taCompany;
+    }
+
     /**
      * url解码
      * @param bizContent