小程序新接口

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

@@ -271,4 +271,28 @@ public class TaContractController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 自动签署合同
+     */
+    @RequestMapping(value = "/wx/contract/manual", method = RequestMethod.POST)
+    public ResponseBean manualContract(@RequestBody TaContract taContract, 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);
+            String signUrl = iTaContractService.manualContract(taContract, person);
+            responseBean.addSuccess(signUrl);
+        } 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 Integer status;
+
     /**
      * 公司名
      */

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

@@ -115,4 +115,7 @@ public class TaContractBusiness implements Serializable {
 
     @TableField(exist = false)
     private String signatrueId;
+
+    @TableField(exist = false)
+    private String fadadaCode;
 }

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

@@ -55,5 +55,13 @@ public interface ITaContractService extends IService<TaContract> {
      * @param person
      * @return
      */
-    TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person);
+    TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception;
+
+    /**
+     * 手动签署合同
+     * @param taContract
+     * @param person
+     * @return
+     */
+    String manualContract(TaContract taContract, TaPerson person);
 }

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

@@ -1,15 +1,21 @@
 package com.huiju.estateagents.eContract.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fadada.sdk.client.FddClientBase;
+import com.fadada.sdk.client.request.ExtsignReq;
+import com.fadada.sdk.test.util.ConfigUtil;
+import com.fadada.sdk.util.http.HttpsUtil;
 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.entity.TaContractUser;
 import com.huiju.estateagents.eContract.mapper.TaContractMapper;
+import com.huiju.estateagents.eContract.mapper.TaContractUserMapper;
 import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaPerson;
@@ -49,6 +55,10 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
     @Autowired
     private TaOrgMapper taOrgMapper;
 
+    @Autowired
+    private TaContractUserMapper taContractUserMapper;
+
+
     @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) {
 
@@ -80,7 +90,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
      */
     @Override
     @Transactional
-    public TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person) {
+    public TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception {
         taRaiseRecord = taRaiseRecordMapper.selectById(taRaiseRecord.getRaiseRecordId());
 
         //根据raiseId获取合同的所有参数
@@ -97,10 +107,74 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         taContract.setInvoiceTargetId(taRaiseRecord.getRaiseRecordId());
         taContract.setCompanyId(taContractBusiness.getCompanyId());
         taContract.setCreateDate(LocalDateTime.now());
+        taContract.setStatus(0);
         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;
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (!jsonObject.getInteger("code").equals("1000")){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+
+        //自动签署合同
+        String timeStamp = HttpsUtil.getTimeStamp();
+        String transaction_id = "TRAN_" + timeStamp;
+        ExtsignReq req = new ExtsignReq();
+        req.setCustomer_id(taContractBusiness.getFadadaCode());
+        req.setTransaction_id(transaction_id);
+        req.setContract_id(taContract.getContractId().toString());
+        req.setClient_role("1");
+        req.setSign_keyword(taContractBusiness.getSignatoryKeywords());
+        req.setKeyword_strategy(taContractBusiness.getSignatoryStrategy());
+        req.setDoc_title(taContractBusiness.getContractTemplateName());
+        String autoSignResult = base.invokeExtSignAuto(req);
+        JSONObject autoSignResultJson = JSONObject.parseObject(autoSignResult);
+        if (!autoSignResultJson.getInteger("code").equals("1000")){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+
+        //反更新合同地址
+        taContract.setContractDownloadUrl(autoSignResultJson.getString("download_url"));
+        taContract.setContractViewUrl(autoSignResultJson.getString("viewpdf_url"));
+        taContract.setStatus(1);
+        taContractMapper.updateById(taContract);
+        return taContract;
+    }
+
+    /**
+     * 手动签署合同
+     *
+     * @param taContract
+     * @param person
+     * @return
+     */
+    @Override
+    public String manualContract(TaContract taContract, TaPerson person) {
+        //获取客户信息
+        QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mini_openid",person.getMiniOpenid());
+        TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
+
+        //根据raiseId获取合同的所有参数
+        TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
+
+        //手动签署合同
+        String timeStamp = HttpsUtil.getTimeStamp();
+        String transaction_id = "TRAN_" + timeStamp;
+
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        ExtsignReq req = new ExtsignReq();
+        req.setCustomer_id(taContractUser.getFadadaCode());
+        req.setTransaction_id(transaction_id);
+        req.setContract_id(taContract.getContractId().toString());
+        req.setSign_keyword(taContractBusiness.getCustomerKeywords());
+        req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
+        req.setDoc_title(taContractBusiness.getContractTemplateName());
+        req.setReturn_url("www.baidu.com");
+        req.setNotify_url("www.baidu.com");
+        String signUrl = base.invokeExtSign(req);
+        return signUrl;
     }
 }

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

@@ -110,11 +110,13 @@
         SELECT
             t.*,
             c.contract_template_address,
-            s.signatrue_id
+            s.signatrue_id,
+            d.fadada_code
         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
+        left JOIN ta_company d on t.company_id = d.company_id
         WHERE
         t.target_type = "raise"
         AND t.target_id = #{raiseId}