新需求

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

@@ -526,10 +526,23 @@ public class TaCompanyController extends BaseController {
                                   @RequestParam(value = "msg_digest",required = false) String msg_digest,
                                   HttpServletRequest request) {
         logger.info("企业认证回调函数参数:交易号 {},合同编号 {}，签章结果代码 {}，签章结果描述 ，{}, 下载地址{}, 查看地址 {},请求时间 {}, 摘要 {} ",transaction_id,contract_id,result_code,result_desc,download_url,viewpdf_url,timestamp,msg_digest);
-        TaContract taContract = iTaContractService.getById(contract_id);
-        taContract.setContractDownloadUrl(download_url);
-        taContract.setContractViewUrl(viewpdf_url);
-        iTaContractService.updateById(taContract);
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        if ("3000".equals(result_code)){
+            TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
+            taContract.setContractDownloadUrl(download_url);
+            taContract.setContractViewUrl(viewpdf_url);
+            taContract.setStatus(CommConstant.STATUS_NORMAL);
+            taContract.setReason(parameterMap.get("result_desc")[0]);
+            iTaContractService.updateById(taContract);
+        }else{
+            TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
+            taContract.setContractDownloadUrl(download_url);
+            taContract.setContractViewUrl(viewpdf_url);
+            //签署失败
+            taContract.setStatus(2);
+            taContract.setReason(parameterMap.get("result_desc")[0]);
+            iTaContractService.updateById(taContract);
+        }
     }
 
     /**

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

@@ -297,4 +297,26 @@ public class TaContractController extends BaseController {
     }
 
 
+    /**
+     * 自动签署合同
+     */
+    @RequestMapping(value = "/wx/contract/check", method = RequestMethod.POST)
+    public ResponseBean checkContract(@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.checkContract(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/entity/TaContract.java

@@ -147,6 +147,11 @@ public class TaContract implements Serializable {
      */
     private String personId;
 
+    /**
+     * 原因
+     */
+    private String reason;
+
     /**
      * 状态
      */

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

@@ -64,4 +64,12 @@ public interface ITaContractService extends IService<TaContract> {
      * @return
      */
     String manualContract(TaContract taContract, TaPerson person) throws Exception;
+
+    /**
+     * 检查签署合同状态
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    TaContract checkContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception;
 }

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

@@ -100,12 +100,29 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
     public TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception {
         taRaiseRecord = taRaiseRecordMapper.selectById(taRaiseRecord.getRaiseRecordId());
 
+
+
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
         if (null == taContractBusiness){
             throw new Exception("无合同模板，请和置业顾问联系");
         }
 
+        //检查是否签署过本合同
+        QueryWrapper<TaContract> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id",taRaiseRecord.getBuildingId());
+        queryWrapper.eq("org_id",taRaiseRecord.getOrgId());
+        queryWrapper.eq("target_type","raise");
+        queryWrapper.eq("target_id",Integer.valueOf(taRaiseRecord.getRaiseId()));
+        queryWrapper.eq("invoice_target_type","raise_record");
+        queryWrapper.eq("invoice_target_id",taRaiseRecord.getRaiseRecordId());
+        queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
+        queryWrapper.eq("person_id",person.getPersonId());
+        TaContract oldContract = taContractMapper.selectOne(queryWrapper);
+        if (null != oldContract){
+            return oldContract;
+        }
+
         //先入合同表
         TaContract taContract = new TaContract();
         taContract.setBuildingId(taRaiseRecord.getBuildingId());
@@ -118,6 +135,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         taContract.setCompanyId(taContractBusiness.getCompanyId());
         taContract.setCreateDate(LocalDateTime.now());
         taContract.setStatus(0);
+        taContract.setPersonId(person.getPersonId());
         taContractMapper.insert(taContract);
 
         //上传合同
@@ -148,7 +166,6 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         //反更新合同地址
         taContract.setContractDownloadUrl(autoSignResultJson.getString("download_url"));
         taContract.setContractViewUrl(autoSignResultJson.getString("viewpdf_url"));
-        taContract.setStatus(1);
         taContractMapper.updateById(taContract);
 
         //企业名称
@@ -183,6 +200,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
 
+        if (taContract.getStatus() == 1){
+            throw new Exception("已经成功签署，无需再次签署");
+        }
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
         if (null == taContractBusiness){
@@ -206,4 +226,35 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         String signUrl = base.invokeExtSign(req);
         return signUrl;
     }
+
+    /**
+     * 检查签署合同状态
+     *
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    @Override
+    public TaContract checkContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception {
+        taRaiseRecord = taRaiseRecordMapper.selectById(taRaiseRecord.getRaiseRecordId());
+
+        //根据raiseId获取合同的所有参数
+        TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
+
+        //检查是否签署过本合同
+        QueryWrapper<TaContract> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id",taRaiseRecord.getBuildingId());
+        queryWrapper.eq("org_id",taRaiseRecord.getOrgId());
+        queryWrapper.eq("target_type","raise");
+        queryWrapper.eq("target_id",Integer.valueOf(taRaiseRecord.getRaiseId()));
+        queryWrapper.eq("invoice_target_type","raise_record");
+        queryWrapper.eq("invoice_target_id",taRaiseRecord.getRaiseRecordId());
+        queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
+        queryWrapper.eq("person_id",person.getPersonId());
+        TaContract oldContract = taContractMapper.selectOne(queryWrapper);
+        return oldContract;
+    }
 }

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

@@ -98,7 +98,7 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         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,"1",null);
+                null,null,null,"1","1");
 
         String data = JSON.parseObject(personResult).getString("data");
         if (null !=data){