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

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -36,27 +36,27 @@ public class CommConstant {
     /**
      * 状态: 正常
      */
-    public final static int STATUS_NORMAL = 1;
+    public final static Integer STATUS_NORMAL = 1;
 
     /**
      * 状态: 删除
      */
-    public final static int STATUS_DELETE = -1;
+    public final static Integer STATUS_DELETE = -1;
 
     /**
      * 状态: 关闭、禁用
      */
-    public final static int STATUS_CLOSED = 9;
+    public final static Integer STATUS_CLOSED = 9;
 
     /**
      * 消息未读
      */
-    public final static int MESSAGE_UNREAD = 0;
+    public final static Integer MESSAGE_UNREAD = 0;
 
     /**
      * 消息已读
      */
-    public final static int MESSAGE_READED = 1;
+    public final static Integer MESSAGE_READED = 1;
 
     /**
      * 点赞置业卡片
@@ -774,4 +774,31 @@ public class CommConstant {
      * 企业认证人员的身份 2 代理人
      */
     public static final String COMPANY_PRINCIPAL_TYPE_AGENT = "2";
+
+    /**
+     * 授权类型 1自动签
+     */
+    public static final Integer AUTH_TYPE = 1;
+
+    /**
+     * 合同关联业务类型
+     */
+    public static final String AUTH = "auth";
+
+    /**
+     * 接口线上授权
+     */
+    public static final String ONLINEAUTH = "onLine";
+
+    /**
+     * 企业实名状态
+     */
+    public static final Integer REAL_NAME_STATUS = 4;
+
+    /**
+     * 已授权自动签章
+     */
+    public static final String AUTO_AUTH_STATUS = "3000";
+
+    public static final String  AUTH_SUCCESS_DESC = "签章成功";
 }

src/main/java/com/huiju/estateagents/config/FadadaProperties.java

@@ -14,5 +14,7 @@ public class FadadaProperties {
     private String version;
     private String serveHost;
     private String companyNotify;
+    private String authReturnUrl;
+    private String authNotifyUrl;
     private String signNotify;
 }

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -155,7 +155,7 @@ public class TaRaiseController extends BaseController {
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
                 // 为邀请制，添加认筹被邀请清单
-                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
+                if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
                     iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), true);
                 }
                 responseBean.addSuccess(taRaise);
@@ -238,7 +238,7 @@ public class TaRaiseController extends BaseController {
             taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
             if (iTaRaiseService.updateById(taRaise)) {
                 // 为邀请制，添加认筹被邀请清单
-                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
+                if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
                     iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), false);
                 }
                 responseBean.addSuccess(taRaise);

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.eContract.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,11 +11,16 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.entity.TaContract;
+import com.huiju.estateagents.eContract.service.ITaCompanySealService;
+import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.huiju.estateagents.eContract.entity.TaContractUser;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.service.ITaContractUserService;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
+import com.huiju.estateagents.service.impl.TaMiniappServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,9 +36,13 @@ import com.huiju.estateagents.eContract.entity.TaCompany;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 /**
  * <p>
@@ -57,9 +67,16 @@ public class TaCompanyController extends BaseController {
     @Autowired
     private ITaCompanySealService iTaCompanySealService;
 
+    @Autowired
+    private ITaContractService iTaContractService;
+
     @Autowired
     public ITaContractUserService iTaContractUserService;
 
+    @Autowired
+    private TaMiniappServiceImpl taMiniappService;
+
+
     /**
      * 条件查询企业列表
      *
@@ -82,7 +99,7 @@ public class TaCompanyController extends BaseController {
             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("status", 2);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -113,7 +130,7 @@ 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("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("status", CommConstant.REAL_NAME_STATUS);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -121,6 +138,7 @@ public class TaCompanyController extends BaseController {
             for (TaCompany taCompany : taCompanyList){
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+                sealQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
             }
             responseBean.addSuccess(result);
@@ -143,10 +161,10 @@ public class TaCompanyController extends BaseController {
     @RequestMapping(value = "/channel/taCompanyList", method = RequestMethod.GET)
     public ResponseBean channelCompanyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                           @RequestParam(value = "companyName") String companyName,
-                                           @RequestParam(value = "companyCode")String companyCode,
-                                           @RequestParam(value = "certifiedStatus")String certifiedStatus,
-                                           @RequestParam(value = "authorizeStatus")String authorizeStatus) {
+                                           @RequestParam(value = "companyName", required = false) String companyName,
+                                           @RequestParam(value = "companyCode", required = false)String companyCode,
+                                           @RequestParam(value = "status", required = false)String status,
+                                           @RequestParam(value = "authorizeStatus", required = false)String authorizeStatus) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -154,9 +172,9 @@ 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(StringUtils.isNotBlank(status), "status", status);
             queryWrapper.eq(StringUtils.isNotBlank(authorizeStatus), "authorize_status", authorizeStatus);
-            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -164,6 +182,7 @@ public class TaCompanyController extends BaseController {
             for (TaCompany taCompany : taCompanyList){
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
                 sealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+                sealQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
                 taCompany.setSealNum(iTaCompanySealService.count(sealQueryWrapper));
             }
             responseBean.addSuccess(result);
@@ -255,7 +274,8 @@ public class TaCompanyController extends BaseController {
     public ResponseBean taCompanyGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaCompanyService.getById(id));
+            TaCompany taCompany = iTaCompanyService.getCompanyAndContractInfo(id);
+            responseBean.addSuccess(taCompany);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taCompanyDelete -=- {}", e.toString());
@@ -439,11 +459,55 @@ public class TaCompanyController extends BaseController {
         }
     }
 
+    /**
+     * 自动授权签章回调
+     */
+    @RequestMapping(value = "/fadd/autoAuthCompanySeal", method = RequestMethod.POST)
+    public void autoAuthCompanySealNotify(@RequestParam(value = "transaction_id",required = false) String transactionId,
+                                          @RequestParam(value = "contract_id",required = false) Integer contractId,
+                                          @RequestParam(value = "download_url",required = false) String downloadUrl,
+                                          @RequestParam(value = "viewpdf_url",required = false) String viewpdfUrl,
+                                          @RequestParam(value = "result_code",required = false) String resultCode,
+                                          @RequestParam(value = "result_desc",required = false) String resultDesc,
+                                          HttpServletRequest request){
+        TaContract taContract = new TaContract();
+        taContract.setContractId(contractId);
+        taContract.setContractDownloadUrl(downloadUrl);
+        taContract.setContractViewUrl(viewpdfUrl);
+        taContract.setStatus(CommConstant.STATUS_NORMAL);
+        iTaContractService.updateById(taContract);
+
+        if (CommConstant.AUTO_AUTH_STATUS.equals(resultCode) && CommConstant.AUTH_SUCCESS_DESC.equals(resultDesc)){
+            TaCompany taCompany = new TaCompany();
+            taCompany.setCompanyId(iTaContractService.getById(contractId).getCompanyId());
+            taCompany.setAuthorizeStatus(resultCode);
+            taCompany.setAuthorizeTransactionId(transactionId);
+            taCompany.setAuthorizeContractId(String.valueOf(contractId));
+            taCompany.setAuthorizeDownloadUrl(downloadUrl);
+            taCompany.setAuthorizeViewUrl(viewpdfUrl);
+            taCompany.setAuthorizeDescription(resultDesc);
+            taCompany.setAuthorizeType(CommConstant.ONLINEAUTH);
+            iTaCompanyService.updateById(taCompany);
+        }
+    }
+
     /**
      * 自动签章授权
      */
-    public ResponseBean autoAuthCompanySeal(Integer companyId, HttpServletRequest request){
-        return null;
+    @RequestMapping(value = "/channel/company/autoAuthCompany/{id}", method = RequestMethod.PUT)
+    public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
+        String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request), taMiniapp.getMiniappId());
+        TaCompany taCompany = new TaCompany();
+        taCompany.setCompanyId(id);
+        taCompany.setAuthorizeAddress(res);
+        iTaCompanyService.updateById(taCompany);
+        responseBean.addSuccess((Object)res);
+        return responseBean;
     }
 
 
@@ -451,7 +515,7 @@ public class TaCompanyController extends BaseController {
      * 手动签署回调函数
      *
      */
-    @RequestMapping(value = "/fadd/sign", method = RequestMethod.POST)
+    @RequestMapping(value = "/fadd/sign", method = {RequestMethod.GET,RequestMethod.POST})
     public void faddSignNotify(@RequestParam(value = "transaction_id ",required = false) String transaction_id,
                                   @RequestParam(value = "contract_id ",required = false) String contract_id,
                                   @RequestParam(value = "result_code",required = false) String result_code,
@@ -462,5 +526,32 @@ 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);
+    }
+
+    /**
+     * 查询授权状态接口
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/channel/company/getAuthStatus/{id}", method = RequestMethod.GET)
+    public ResponseBean getAuthStatus(@PathVariable Integer id, HttpServletRequest request){
+        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
+        ResponseBean responseBean = new ResponseBean();
+        String res = iTaCompanyService.getAuthStatus(id, taMiniapp.getMiniappId());
+        JSONObject result = JSONObject.parseObject(res);
+
+        if ((Integer) result.get("code") != 1){
+            responseBean.addError(result.getString("msg"));
+            return responseBean;
+        }
+        responseBean.addSuccess(result.get("data"));
+        return responseBean;
     }
 }

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

@@ -13,11 +13,14 @@ import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.eContract.service.ITaCompanyService;
 import com.huiju.estateagents.eContract.service.impl.TaCompanySealUtil;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.impl.TaMiniappServiceImpl;
 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.time.LocalDateTime;
 
 /**
@@ -43,6 +46,9 @@ public class TaCompanySealController extends BaseController {
     @Autowired
     private TaCompanySealUtil taCompanySealUtil;
 
+    @Autowired
+    private TaMiniappServiceImpl taMiniappService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -59,6 +65,7 @@ public class TaCompanySealController extends BaseController {
 		    IPage<TaCompanySeal> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);
@@ -109,11 +116,14 @@ public class TaCompanySealController extends BaseController {
      * @return
      */
     @RequestMapping(value="/channel/taCompanySeal",method= RequestMethod.POST)
-    public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal){
+    public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
+            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
             JSONObject params = JSONObject.parseObject(result);
             if ((Integer) params.get("code") != 1){
                 responseBean.addError(params.get("msg").toString());
@@ -143,13 +153,17 @@ public class TaCompanySealController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value="/channel/delCompanySeal/{id}", method= RequestMethod.PUT)
-    public ResponseBean taCompanySealDelete(@PathVariable Integer id){
+    public ResponseBean taCompanySealDelete(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
             TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
             iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
+            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId(), taMiniapp.getMiniappId());
             JSONObject params = JSONObject.parseObject(res);
             Integer code = (Integer) params.get("code");
             if (code != 1){
@@ -181,12 +195,16 @@ public class TaCompanySealController extends BaseController {
      */
     @RequestMapping(value="/channel/taCompanySeal/{id}",method= RequestMethod.PUT)
     public ResponseBean taCompanySealUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCompanySeal taCompanySeal){
+                                        @RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
             TaCompanySeal sealInfo = iTaCompanySealService.getById(id);
-            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg());
+            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
             JSONObject params = JSONObject.parseObject(res);
             Integer code = (Integer) params.get("code");
             if (code != 1){

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

@@ -287,7 +287,7 @@ public class TaContractController extends BaseController {
             }
             TaPerson person = taPersons.get(0);
             String signUrl = iTaContractService.manualContract(taContract, person);
-            responseBean.addSuccess(signUrl);
+            return ResponseBean.success(signUrl);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taCompanyList -=- {}", e.toString());

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

@@ -167,4 +167,7 @@ public class TaCompany implements Serializable {
 
     @TableField(exist = false)
     private Integer sealNum;
+
+    @TableField(exist = false)
+    private String contractId;
 }

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

@@ -119,7 +119,7 @@ public class TaContractBusiness implements Serializable {
     private String contractTemplateAddress;
 
     @TableField(exist = false)
-    private String signatrueId;
+    private String signatureId;
 
     @TableField(exist = false)
     private String fadadaCode;

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

@@ -18,5 +18,5 @@ import org.springframework.stereotype.Component;
 @Mapper
 @Component
 public interface TaCompanyMapper extends BaseMapper<TaCompany> {
-
+    TaCompany getCompanyAndContractInfo(@Param("companyId") Integer companyId);
 }

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

@@ -33,4 +33,10 @@ public interface ITaCompanyService extends IService<TaCompany> {
      * @return
      */
     TaCompany updateCompanyInfoByFdd(Integer id) throws Exception;
+
+    String autoAuthCompanySeal(Integer companyId, Integer orgId, String miniAppId) throws Exception;
+
+    TaCompany getCompanyAndContractInfo(Integer companyId);
+
+    String getAuthStatus(Integer companyId, String miniAppId);
 }

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

@@ -63,5 +63,5 @@ public interface ITaContractService extends IService<TaContract> {
      * @param person
      * @return
      */
-    String manualContract(TaContract taContract, TaPerson person);
+    String manualContract(TaContract taContract, TaPerson person) throws Exception;
 }

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

@@ -3,12 +3,18 @@ package com.huiju.estateagents.eContract.service.impl;
 import com.fadada.sdk.client.FddClientBase;
 import com.fadada.sdk.util.crypt.FddEncryptTool;
 import com.fadada.sdk.util.http.HttpsUtil;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import org.apache.http.message.BasicNameValuePair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 @Component
 public class TaCompanySealUtil {
@@ -16,13 +22,16 @@ public class TaCompanySealUtil {
     @Autowired
     private FadadaProperties fadadaProperties;
 
-    public String addSignaTure(String customerId, String imgUrl) throws Exception {
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), fadadaProperties.getServeHost());
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    public String addSignaTure(String customerId, String imgUrl, String miniappId) throws Exception {
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), getFddServerHost(miniappId,fadadaProperties.getServeHost()));
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         return base.invokeaddSignature(customerId, base64Url);
     }
 
-    public String replaceSignature(String customerId, String signatureId, String imgUrl){
+    public String replaceSignature(String customerId, String signatureId, String imgUrl, String miniappId){
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         ArrayList params = new ArrayList();
 
@@ -42,10 +51,10 @@ public class TaCompanySealUtil {
             throw new RuntimeException(var7);
         }
 
-        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "replace_signature.api", params);
+        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "replace_signature.api", params);
     }
 
-    public String delSignature(String customerId, String signatureId){
+    public String delSignature(String customerId, String signatureId, String miniappId){
         ArrayList params = new ArrayList();
 
         try {
@@ -63,6 +72,58 @@ public class TaCompanySealUtil {
             throw new RuntimeException(var7);
         }
 
-        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "remove_signature.api", params);
+        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "remove_signature.api", params);
+    }
+
+    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId, String miniappId) throws Exception {
+        String timeStamp = HttpsUtil.getTimeStamp();
+        String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(transactionId + timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
+        String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+        StringBuilder stringBuilder = new StringBuilder(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "before_authsign.api?");
+        stringBuilder.append("app_id="+fadadaProperties.getAppId()+"&");
+        stringBuilder.append("customer_id="+customerId+"&");
+        stringBuilder.append("timestamp="+timeStamp+"&");
+        stringBuilder.append("v="+fadadaProperties.getVersion()+"&");
+        stringBuilder.append("transaction_id="+transactionId+"&");
+        stringBuilder.append("auth_type="+authType+"&");
+        stringBuilder.append("contract_id="+contractId+"&");
+        stringBuilder.append("msg_digest="+msgDigest+"&");
+        stringBuilder.append("notify_url="+fadadaProperties.getAuthNotifyUrl()+"&");
+        stringBuilder.append("return_url="+fadadaProperties.getAuthReturnUrl() + companyId);
+
+        return stringBuilder.toString();
+    }
+
+    public String getAuthStatus(String customerId, String miniappId){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("customer_id", customerId));
+            params.add(new BasicNameValuePair("app_id", fadadaProperties.getAppId()));
+            params.add(new BasicNameValuePair("timestamp", timeStamp));
+            params.add(new BasicNameValuePair("v", fadadaProperties.getVersion()));
+            params.add(new BasicNameValuePair("msg_digest", msgDigest));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "get_auth_status.api", params);
+    }
+
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf(File.separator);
+        int twoIndex = subUrl.indexOf(File.separator,index);
+        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
     }
 }

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

@@ -13,16 +13,24 @@ 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.controller.CommonController;
 import com.huiju.estateagents.eContract.entity.TaCompany;
+import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.mapper.TaCompanyMapper;
+import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.eContract.service.ITaCompanyService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.sample.mapper.TaContactMapper;
 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.io.File;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
@@ -44,6 +52,15 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
     @Autowired
     private TaCompanyMapper taCompanyMapper;
 
+    @Autowired
+    private TaContractMapper taContractMapper;
+
+    @Autowired
+    private TaCompanySealUtil taCompanySealUtil;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
     /**
      * 在法大大创建一个新的企业信息
      *
@@ -70,6 +87,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         taCompany.setCertifiedStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
         taCompany.setCreateDate(LocalDateTime.now());
         taCompany.setStatus(CommConstant.STATUS_UNACCALIMED);
+        taCompany.setAuthorizeStatus("3001");
         taCompanyMapper.insert(taCompany);
         return taCompany;
     }
@@ -185,6 +203,37 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         return taCompany;
     }
 
+    @Override
+    public String autoAuthCompanySeal(Integer companyId, Integer orgId, String miniAppId) throws Exception {
+        TaCompany taCompany = taCompanyMapper.selectById(companyId);
+        String timeStamp = HttpsUtil.getTimeStamp();
+        String transactionId = "TRAN" + timeStamp;
+        TaContract taContract = new TaContract();
+        taContract.setCompanyId(companyId);
+        taContract.setOrgId(orgId);
+        taContract.setCreateDate(LocalDateTime.now());
+        taContract.setTargetType(CommConstant.AUTH);
+        taContract.setStatus(CommConstant.STATUS_UNACCALIMED);
+        taContract.setOrgId(orgId);
+        taContractMapper.insert(taContract);
+
+        Integer contractId = taContract.getContractId();
+        String customerId = taCompany.getFadadaCode();
+        String res = taCompanySealUtil.autoAuthCompanySeal(transactionId, CommConstant.AUTH_TYPE, String.valueOf(contractId), customerId, String.valueOf(companyId), miniAppId);
+        return res;
+    }
+
+    @Override
+    public TaCompany getCompanyAndContractInfo(Integer companyId) {
+        return taCompanyMapper.getCompanyAndContractInfo(companyId);
+    }
+
+    @Override
+    public String getAuthStatus(Integer companyId, String miniAppId) {
+        TaCompany taCompany = taCompanyMapper.selectById(companyId);
+        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode(), miniAppId);
+    }
+
     /**
      * url解码
      * @param bizContent
@@ -195,4 +244,17 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         bizContent = new String(Base64.decodeBase64(bizContent.getBytes()));
         return bizContent;
     }
+
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf(File.separator);
+        int twoIndex = subUrl.indexOf(File.separator,index);
+        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
 }

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

@@ -10,6 +10,7 @@ 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.common.StringUtils;
 import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.entity.TaContract;
 import com.huiju.estateagents.eContract.entity.TaContractBusiness;
@@ -18,8 +19,10 @@ 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.TaMiniapp;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.File;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Map;
@@ -58,6 +62,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
     @Autowired
     private TaContractUserMapper taContractUserMapper;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
 
     @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) {
@@ -95,6 +102,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
 
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
 
         //先入合同表
         TaContract taContract = new TaContract();
@@ -111,10 +121,10 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         taContractMapper.insert(taContract);
 
         //上传合同
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
         String result = base.invokeUploadDocs(taContract.getContractId().toString(), taContractBusiness.getContractTemplateName(), null, taContractBusiness.getContractTemplateAddress(), ".pdf");
         JSONObject jsonObject = JSONObject.parseObject(result);
-        if (!jsonObject.getInteger("code").equals("1000")){
+        if (!jsonObject.getString("code").equals("1000")){
             throw new Exception(jsonObject.getString("msg"));
         }
 
@@ -131,7 +141,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setDoc_title(taContractBusiness.getContractTemplateName());
         String autoSignResult = base.invokeExtSignAuto(req);
         JSONObject autoSignResultJson = JSONObject.parseObject(autoSignResult);
-        if (!autoSignResultJson.getInteger("code").equals("1000")){
+        if (!autoSignResultJson.getString("code").equals("1000")){
             throw new Exception(jsonObject.getString("msg"));
         }
 
@@ -140,9 +150,25 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         taContract.setContractViewUrl(autoSignResultJson.getString("viewpdf_url"));
         taContract.setStatus(1);
         taContractMapper.updateById(taContract);
+
+        //企业名称
+        taContract.setCompanyName(taContractBusiness.getCompanyName());
         return taContract;
     }
 
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf(File.separator);
+        int twoIndex = subUrl.indexOf(File.separator,index);
+        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+
     /**
      * 手动签署合同
      *
@@ -151,8 +177,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
      * @return
      */
     @Override
-    public String
-    manualContract(TaContract taContract, TaPerson person) {
+    public String manualContract(TaContract taContract, TaPerson person) throws Exception {
         //获取客户信息
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
@@ -160,12 +185,15 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
 
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
 
         //手动签署合同
         String timeStamp = HttpsUtil.getTimeStamp();
         String transaction_id = "TRAN_" + timeStamp;
 
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
         ExtsignReq req = new ExtsignReq();
         req.setCustomer_id(taContractUser.getFadadaCode());
         req.setTransaction_id(transaction_id);

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

@@ -7,19 +7,23 @@ 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.common.StringUtils;
 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.TaMiniapp;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 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.io.File;
 import java.time.LocalDateTime;
 
 /**
@@ -39,6 +43,9 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
 
     @Autowired
     private TaContractUserMapper taContractUserMapper;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
     /**
      * 小程序端首次签署合同的是要在法大大处创建账号
      *
@@ -59,9 +66,9 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         //没有法大大账号的先注册
         log.info("========法大大个人注册=======");
         //在法大大注册个人用户
-        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
-        //小程序id为注册账号
-        String open_id = person.getMiniappId();
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        //小程序open——id为注册账号
+        String open_id = person.getMiniOpenid();
         //account_type 1是个人注册
         String result =base.invokeregisterAccount(open_id,"1");
         log.info("法大大注册信息{}", result);
@@ -81,8 +88,9 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         newContractUser.setOrgId(CommConstant.STATUS_UNACCALIMED);
 
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
-        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
         String customer_id = jsonObject.getString("data");
+        //0:三要素标准方案； 1:三要素补充方案；
         String verifyed_way = "0";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
@@ -90,13 +98,13 @@ 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,null,null);
+                null,null,null,"1",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.setCertifiedAddress(getFddServerHost(person.getMiniappId(),url));
             newContractUser.setCertifiedSerialNumber(JSON.parseObject(data).getString("transactionNo"));
         }
         newContractUser.setStatus(0);
@@ -106,6 +114,19 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         return newContractUser;
     }
 
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf(File.separator);
+        int twoIndex = subUrl.indexOf(File.separator,index);
+        int threeIndex = subUrl.indexOf(File.separator,twoIndex);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+
     /**
      * 去法大大处更新客户的状态
      *
@@ -119,7 +140,7 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         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());
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
         String verified_serialno = taContractUser.getCertifiedSerialNumber();
         String result = personCertInfo.invokeFindPersonCert(verified_serialno,
                 "1");

src/main/java/com/huiju/estateagents/entity/TaMiniapp.java

@@ -59,6 +59,8 @@ public class TaMiniapp implements Serializable {
 
     private String aesKey;
 
+    private String fddServerHost;
+
     @TableField(exist = false)
     private List<TaMiniappTemplate> tpls;
 }

src/main/java/com/huiju/estateagents/entity/TaRaise.java

@@ -170,8 +170,7 @@ public class TaRaise implements Serializable {
     /**
      * 是否邀请制 1是 0否
      */
-    @TableField(exist = false)
-    private Integer isInvite;
+    private Integer invite;
 
     /**
      * 被邀请电话号码

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -118,11 +118,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     private TaPersonBuildingMapper taPersonBuildingMapper;
 
     @Autowired
-    private ITaRaiseInviteService iTaRaiseInviteService;
+    private ITaRaiseService iTaRaiseService;
 
     @Autowired
     private ITaPersonService iTaPersonService;
 
+    @Autowired
+    private ITaRaiseInviteService iTaRaiseInviteService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -346,25 +349,33 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
         taSalesBatch.stream().forEach(record -> {
             // 查询批次下认筹是否开启邀请制
-            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
-            taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
-            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-            if (taRaiseInvite == null) {
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+            taRaiseQueryWrapper.eq("org_id", orgId);
+            taRaiseQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
+            taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
+            if (taRaise == null) {
                 resultSalesBatchList.add(record);
                 return;
             }
 
-            // 若开启邀请制，校验该用户是否在邀请列表中
-            taRaiseInviteQueryWrapper = new QueryWrapper<>();
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
-            taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
-            taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
-            TaRaiseInvite taRaiseInvite2 = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-            if(taRaiseInvite2 != null){
+            // 未开启邀请制
+            if (CommConstant.STATUS_NORMAL != taRaise.getInvite()) {
                 resultSalesBatchList.add(record);
                 return;
             }
+
+            if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+                // 若开启邀请制，校验该用户是否在邀请列表中
+                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+                taRaiseInviteQueryWrapper.eq("org_id", orgId);
+                taRaiseInviteQueryWrapper.eq("invite_tel", person.getTel());
+                taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
+                TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+                if (taRaiseInvite != null) {
+                    resultSalesBatchList.add(record);
+                }
+            }
         });
 
         building.setSalesBatch(resultSalesBatchList);

src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java

@@ -435,7 +435,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
                         map.put("taContract", taContract);
                     }
                 } else {
-                    taRaiseRecord.setShowContract(0);
+                    taRaiseRecord.setShowContract(1);
                 }
             } else {
                 taRaiseRecord.setShowContract(0);
@@ -448,7 +448,6 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         map.put("taRaiseHouseList", taRaiseHouseList);
         map.put("houseList", houseList);
         map.put("taOrder", taOrder);
-
         map.put("taRaise", taRaise);
         responseBean.addSuccess(map);
         return responseBean;

src/main/java/com/huiju/estateagents/service/impl/TaRaiseServiceImpl.java

@@ -114,23 +114,20 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             return responseBean;
         }
 
-        // 获取邀请人数据
-        QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-        taRaiseInviteQueryWrapper.eq("org_id", orgId);
-        taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
-        taRaiseInviteQueryWrapper.orderByAsc("create_date");
-        List<TaRaiseInvite> taRaiseInviteList = taRaiseInviteService.list(taRaiseInviteQueryWrapper);
-        StringBuilder inviteTelSb = new StringBuilder();
-        taRaiseInviteList.stream().forEach(record -> {
-            inviteTelSb.append(record.getInviteTel() + "\n");
-        });
-
-        if (CollectionUtils.isEmpty(taRaiseInviteList)) {
-            taRaise.setIsInvite(CommConstant.STATUS_UNACCALIMED);
-        } else {
-            taRaise.setIsInvite(CommConstant.STATUS_NORMAL);
+        if (taRaise.getInvite() != null && CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+            // 获取邀请人数据
+            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+            taRaiseInviteQueryWrapper.eq("org_id", orgId);
+            taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
+            taRaiseInviteQueryWrapper.orderByAsc("create_date");
+            List<TaRaiseInvite> taRaiseInviteList = taRaiseInviteService.list(taRaiseInviteQueryWrapper);
+            StringBuilder inviteTelSb = new StringBuilder();
+            taRaiseInviteList.stream().forEach(record -> {
+                inviteTelSb.append(record.getInviteTel() + "\n");
+            });
             taRaise.setInviteTel(inviteTelSb.toString());
         }
+
         taRaise.setRaisePrice(taRaise.getRaisePrice() == null ? null : taRaise.getRaisePrice());
         responseBean.addSuccess(taRaise);
         return responseBean;
@@ -189,7 +186,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
                 new String[]{} : taRaise.getInviteTel().split("\n");
 
-        Arrays.asList(inviteTelArr).stream().forEach(record -> {
+        Arrays.asList(inviteTelArr).stream().distinct().forEach(record -> {
             TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
             taRaiseInvite.setOrgId(orgId);
             taRaiseInvite.setRaiseId(taRaise.getRaiseId());
@@ -204,7 +201,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             } else {
                 QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
                 taRaiseInviteQueryWrapper.eq("org_id", orgId);
-                taRaiseInviteQueryWrapper.eq("org_id", taRaise.getRaiseId());
+                taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
                 taRaiseInviteQueryWrapper.eq("invite_tel", record);
                 TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
                 if (queryResult == null) {

src/main/resources/application-blue.yml

@@ -83,6 +83,8 @@ fadada:
   appId: "403057"
   appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
   version: "2.0"
-  serveHost: "https://testapi.fadada.com:8443/api/"
+  serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

src/main/resources/application-green.yml

@@ -85,4 +85,6 @@ fadada:
   version: "2.0"
   serveHost: "https://testapi.fadada.com:8443/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  signNotify: "https://dev.pawoma.cn/api/fadd/sign"
+  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.pawoma.cn/api/fadd/sign"

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

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.eContract.mapper.TaCompanyMapper">
 
+    <select id="getCompanyAndContractInfo" resultType="com.huiju.estateagents.eContract.entity.TaCompany">
+        select *,a.contract_id From ta_company t
+        left join ta_contract a on t.company_id = a.company_id and a.target_type = 'auth' and a.status = 1
+        where t.company_id = #{companyId}
+    </select>
+
 </mapper>

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

@@ -110,7 +110,7 @@
         SELECT
             t.*,
             c.contract_template_address,
-            s.signatrue_id,
+            s.signature_id,
             d.fadada_code
         FROM
             ta_contract_business t