新需求 小程序接口

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

@@ -9,7 +9,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 import com.huiju.estateagents.common.CommonUtils;
 import com.huiju.estateagents.eContract.entity.TaContract;
+import com.huiju.estateagents.eContract.entity.TaContractUser;
 import com.huiju.estateagents.eContract.service.ITaContractService;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
+import java.util.List;
 
 
 /**
@@ -38,6 +43,10 @@ public class TaContractController extends BaseController {
     @Autowired
     public ITaContractService iTaContractService;
 
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
     /**
      * 条件查询合同列表 -- admin端
      *
@@ -217,4 +226,27 @@ public class TaContractController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 自动签署合同
+     */
+    @RequestMapping(value = "/wx/contract/auto", method = RequestMethod.POST)
+    public ResponseBean autoContract(@RequestBody TaRaiseRecord taRaiseRecord, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = getOpenId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            TaContract taContract = iTaContractService.autoContract(taRaiseRecord, person);
+            responseBean.addSuccess(taContract);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -5,13 +5,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.eContract.entity.TaCompany;
 import com.huiju.estateagents.eContract.entity.TaContractUser;
 import com.huiju.estateagents.eContract.service.ITaContractUserService;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 电子合同注册用户表  前端控制器
@@ -30,6 +37,9 @@ public class TaContractUserController extends BaseController {
     public ITaContractUserService iTaContractUserService;
 
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -140,4 +150,53 @@ public class TaContractUserController extends BaseController {
         }
         return responseBean;
     }
+
+
+
+    /**
+     * 给用户在法大大注册账号
+     */
+    @RequestMapping(value = "/wx/contract/user/add", method = RequestMethod.POST)
+    public ResponseBean addCompanyFirstInfo(@RequestBody TaRaiseRecord taRaiseRecord,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = getOpenId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            TaContractUser taContractUser = iTaContractUserService.newFirstCustomerInfo(person,taRaiseRecord);
+            responseBean.addSuccess(taContractUser);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取个人用户的最新状态
+     */
+    @RequestMapping(value = "/wx/contract/user/get", method = RequestMethod.GET)
+    public ResponseBean getCompanyFirstInfo(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = getOpenId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            TaContractUser taContractUser = iTaContractUserService.getFirstCustomerInfo(person);
+            responseBean.addSuccess(taContractUser);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -7,6 +7,7 @@ import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * <p>
@@ -54,5 +55,8 @@ public class TaCompanySeal implements Serializable {
      */
     private Integer status;
 
-
+    /**
+     * 签章id
+     */
+    private String signatureId;
 }

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

@@ -36,7 +36,7 @@ public class TaContract implements Serializable {
     /**
      * 企业id
      */
-    private String companyId;
+    private Integer companyId;
 
     /**
      * 公司id

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

@@ -110,4 +110,9 @@ public class TaContractBusiness implements Serializable {
      */
     private Integer status;
 
+    @TableField(exist = false)
+    private String contractTemplateAddress;
+
+    @TableField(exist = false)
+    private String signatrueId;
 }

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

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.eContract.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.huiju.estateagents.entity.TaRaiseRecord;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -39,6 +42,11 @@ public class TaContractUser implements Serializable {
      */
     private String authStatus;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
     /**
      * 认证失败原因
      */
@@ -62,4 +70,21 @@ public class TaContractUser implements Serializable {
     /** 小程序用户id */
     private String personId;
 
+    /**
+     * 法大大客户编号
+     */
+    private String fadadaCode;
+
+    /**
+     * 个人认证地址
+     */
+    private String certifiedAddress;
+
+    /**
+     * 认证序列号
+     */
+    private String certifiedSerialNumber;
+
+    @TableField(exist = false)
+    private Integer raiseRecordId;
 }

src/main/java/com/huiju/estateagents/eContract/mapper/TaContractMapper.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 import com.huiju.estateagents.eContract.entity.TaContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
+import java.util.Map;
 
 /**
  * <p>
@@ -35,4 +37,11 @@ public interface TaContractMapper extends BaseMapper<TaContract> {
 
     IPage<TaContract> listContractForChannel(IPage<TaContract> pg,
                                              @Param("bo") ContractRecordRequestBO bo);
+
+    /**
+     * 获取合同信息
+     * @param raiseId
+     * @return
+     */
+    TaContractBusiness selectContractInfoByRaiseId(@Param("raiseId") String raiseId);
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 import com.huiju.estateagents.eContract.entity.TaContract;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRaiseRecord;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -46,4 +48,12 @@ public interface ITaContractService extends IService<TaContract> {
      * @return
      */
     ResponseBean listContractForChannel(ContractRecordRequestBO requestBO);
+
+    /**
+     * 企业自动签署合同
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person);
 }

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

@@ -2,6 +2,8 @@ package com.huiju.estateagents.eContract.service;
 
 import com.huiju.estateagents.eContract.entity.TaContractUser;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRaiseRecord;
 
 /**
  * <p>
@@ -13,4 +15,18 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaContractUserService extends IService<TaContractUser> {
 
+    /**
+     * 小程序端首次签署合同的是要在法大大处创建账号
+     * @param person
+     * @param taRaiseRecord
+     * @return
+     */
+    TaContractUser newFirstCustomerInfo(TaPerson person, TaRaiseRecord taRaiseRecord) throws Exception;
+
+    /**
+     * 去法大大处更新客户的状态
+     * @param person
+     * @return
+     */
+    TaContractUser getFirstCustomerInfo(TaPerson person) throws Exception;
 }

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

@@ -109,7 +109,6 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         String certFlag = "1";
 
         String notify_url = "http://www.baidu.com";//必填
-//        String return_url = "http://www.baidu.com";//可填
         String result = comverify.invokeCompanyVerifyUrl(new CompanyInfoINO(), new BankInfoINO(),new LegalInfoINO()
                 ,new AgentInfoINO(), customer_id,verifyed_way,m_verified_way,page_modify,
                 companyPrincipalType,null,notify_url,resultType,certFlag);

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

@@ -3,17 +3,27 @@ package com.huiju.estateagents.eContract.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fadada.sdk.client.FddClientBase;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
+import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.entity.TaContract;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.mapper.TaOrgMapper;
+import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,9 +37,18 @@ import java.time.LocalDate;
 @Slf4j
 public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContract> implements ITaContractService {
 
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
     @Autowired
     private TaContractMapper taContractMapper;
 
+    @Autowired
+    private TaRaiseRecordMapper taRaiseRecordMapper;
+
+    @Autowired
+    private TaOrgMapper taOrgMapper;
+
     @Override
     public ResponseBean listContractForAdmin(Integer pageNum, Integer pageSize, String contractName, Boolean archives, String signatoryName, Integer signatoryStatus, String customerName, Integer customerStatus, LocalDate archivesStartDate, LocalDate archivesEndDate, Integer orgId) {
 
@@ -51,4 +70,37 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         responseBean.addSuccess(pg);
         return responseBean;
     }
+
+    /**
+     * 企业自动签署合同
+     *
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    @Override
+    @Transactional
+    public TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person) {
+        taRaiseRecord = taRaiseRecordMapper.selectById(taRaiseRecord.getRaiseRecordId());
+
+        //根据raiseId获取合同的所有参数
+        TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
+
+        //先入合同表
+        TaContract taContract = new TaContract();
+        taContract.setBuildingId(taRaiseRecord.getBuildingId());
+        taContract.setOrgId(taRaiseRecord.getOrgId());
+        taContract.setOrgName(taOrgMapper.selectById(taRaiseRecord.getOrgId()).getName());
+        taContract.setTargetType("raise");
+        taContract.setTargetId(Integer.valueOf(taRaiseRecord.getRaiseId()));
+        taContract.setInvoiceTargetType("raise_record");
+        taContract.setInvoiceTargetId(taRaiseRecord.getRaiseRecordId());
+        taContract.setCompanyId(taContractBusiness.getCompanyId());
+        taContract.setCreateDate(LocalDateTime.now());
+        taContractMapper.insert(taContract);
+
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String result = base.invokeUploadDocs(taContract.getContractId().toString(), taContractBusiness.getContractTemplateName(), null, taContractBusiness.getContractTemplateAddress(), ".pdf");
+        return null;
+    }
 }

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

@@ -1,11 +1,27 @@
 package com.huiju.estateagents.eContract.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fadada.sdk.client.FddClientBase;
+import com.fadada.sdk.client.authForfadada.FindCertInfo;
+import com.fadada.sdk.client.authForfadada.GetPersonVerifyUrl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.entity.TaContractUser;
 import com.huiju.estateagents.eContract.mapper.TaContractUserMapper;
 import com.huiju.estateagents.eContract.service.ITaContractUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRaiseRecord;
+import jodd.util.URLDecoder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 电子合同注册用户表  服务实现类
@@ -14,7 +30,123 @@ import org.springframework.stereotype.Service;
  * @author fxf
  * @since 2020-03-26
  */
+@Slf4j
 @Service
 public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper, TaContractUser> implements ITaContractUserService {
 
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
+    @Autowired
+    private TaContractUserMapper taContractUserMapper;
+    /**
+     * 小程序端首次签署合同的是要在法大大处创建账号
+     *
+     * @param person
+     * @param taRaiseRecord
+     * @return
+     */
+    @Override
+    public TaContractUser newFirstCustomerInfo(TaPerson person, TaRaiseRecord taRaiseRecord) throws Exception {
+        //首先判断是否注册过账号
+        QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mini_openid",person.getMiniOpenid());
+        TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
+        if (null != taContractUser) {
+            taContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+            return taContractUser;
+        }
+        //没有法大大账号的先注册
+        log.info("========法大大个人注册=======");
+        //在法大大注册个人用户
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        //小程序id为注册账号
+        String open_id = person.getMiniappId();
+        //account_type 1是个人注册
+        String result =base.invokeregisterAccount(open_id,"1");
+        log.info("法大大注册信息{}", result);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (jsonObject.getInteger("code") != 1){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+
+        //插入个人用户数据
+        TaContractUser newContractUser = new TaContractUser();
+        newContractUser.setMiniOpenid(open_id);
+        newContractUser.setFadadaCode(jsonObject.getString("data"));
+        newContractUser.setPersonId(person.getPersonId());
+        newContractUser.setAuthStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
+        newContractUser.setCreateDate(LocalDateTime.now());
+        newContractUser.setOrgId(person.getOrgId());
+        newContractUser.setOrgId(CommConstant.STATUS_UNACCALIMED);
+
+        log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
+        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String customer_id = jsonObject.getString("data");
+        String verifyed_way = "0";
+        String page_modify = "1";
+        String notify_url = "https://www.baidu.com";
+        String return_url= "https://www.baidu.com"+"?raiseRecordId=" + taRaiseRecord.getRaiseRecordId();
+        String customer_ident_type = "0";
+        String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
+                page_modify,notify_url,return_url,null,customer_ident_type,
+                null,null,null,null,null);
+
+        String data = JSON.parseObject(personResult).getString("data");
+        if (null !=data){
+            String url = JSON.parseObject(data).getString("url");
+            url = decode(url);
+            newContractUser.setCertifiedAddress(url);
+            newContractUser.setCertifiedSerialNumber(JSON.parseObject(data).getString("transactionNo"));
+        }
+        newContractUser.setAuthStatus(CommConstant.CERTIFIED_STATUS_CERTIFICATION);
+        newContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+        taContractUserMapper.insert(newContractUser);
+        return newContractUser;
+    }
+
+    /**
+     * 去法大大处更新客户的状态
+     *
+     * @param person
+     * @return
+     */
+    @Override
+    public TaContractUser getFirstCustomerInfo(TaPerson person) throws Exception {
+        //注册账号信息
+        QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mini_openid",person.getMiniOpenid());
+        TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
+        log.info("个人正在从法大大获取最新数据，企业编号是 {}", taContractUser.getFadadaCode());
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String verified_serialno = taContractUser.getCertifiedSerialNumber();
+        String result = personCertInfo.invokeFindPersonCert(verified_serialno,
+                "1");
+        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 personJson = dataJson.getJSONObject("person");
+            if (null != personJson){
+                taContractUser.setStatus(personJson.getInteger("status"));
+                taContractUser.setTel(personJson.getString("mobile"));
+                taContractUser.setIdCard(personJson.getString("idCard"));
+                taContractUser.setReason(personJson.getString("auditFailReason"));
+            }
+        }
+        taContractUserMapper.updateById(taContractUser);
+        return taContractUser;
+    }
+
+    private String decode(String bizContent) {
+        bizContent = URLDecoder.decode(bizContent, "utf-8");
+        bizContent = new String(Base64.decodeBase64(bizContent.getBytes()));
+        return bizContent;
+    }
 }

src/main/resources/mapper/eContract/TaContractMapper.xml

@@ -105,4 +105,19 @@
         ORDER BY
             t.signatory_time DESC
     </select>
+
+    <select id="selectContractInfoByRaiseId" resultType="com.huiju.estateagents.eContract.entity.TaContractBusiness">
+        SELECT
+            t.*,
+            c.contract_template_address,
+            s.signatrue_id
+        FROM
+            ta_contract_business t
+        LEFT JOIN ta_contract_template c ON t.contract_template_id = c.contract_template_id
+        LEFT JOIN ta_company_seal s ON t.seal_id = s.seal_id
+        WHERE
+        t.target_type = "raise"
+        AND t.target_id = #{raiseId}
+        AND t.`status` = 1
+    </select>
 </mapper>