Merge branch 'dev'

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.18</version>
+	<version>v3.5.19</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -128,19 +128,19 @@
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>2.7.0</version>
 		</dependency>
+
+
+		<dependency>
+			<groupId>fadada</groupId>
+			<artifactId>fadada_api_sdk</artifactId>
+			<version>2.4.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/src/main/resources/lib/fadada_api_sdk_2.4.0.jar</systemPath>
+		</dependency>
 	</dependencies>
 
 
 	<profiles>
-<!--		<profile>-->
-<!--			<id>dev</id>-->
-<!--			<activation>-->
-<!--				<activeByDefault>true</activeByDefault>-->
-<!--			</activation>-->
-<!--			<properties>-->
-<!--				<profiles.active>dev</profiles.active>-->
-<!--			</properties>-->
-<!--		</profile>-->
 		<profile>
 			<id>green</id>
 			<properties>
@@ -174,17 +174,25 @@
 			</plugin>
 		</plugins>
 		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>application.yml</include>
-					<include>application-${profiles.active}.yml</include>
-					<include>mapper/**/*.xml</include>
-					<include>log/*.xml</include>
-				</includes>
-			</resource>
-		</resources>
-	</build>
+				<resource>
+					<directory>${basedir}/src/main/resources/lib</directory>
+					<targetPath>BOOT-INF/lib/</targetPath>
+					<includes>
+						<include>**/*.jar</include>
+					</includes>
+				</resource>
+                <resource>
+                    <directory>src/main/resources</directory>
+                    <filtering>true</filtering>
+                    <includes>
+                        <include>application.yml</include>
+                        <include>application-${profiles.active}.yml</include>
+                        <include>mapper/**/*.xml</include>
+                        <include>log/*.xml</include>
+                        <include>lib/*.jar</include>
+                    </includes>
+                </resource>
+            </resources>
+        </build>
 
-</project>
+    </project>

src/main/java/com/huiju/estateagents/bo/request/ContractRecordRequestBO.java

@@ -0,0 +1,88 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * 查询合同列表请求实体
+ */
+@Data
+public class ContractRecordRequestBO {
+
+    /**
+     * 页码
+     */
+    private Integer pageNum = 1;
+
+    /**
+     * 分页大小
+     */
+    private Integer pageSize = 10;
+
+    /**
+     * 公司名
+     */
+    private String companyName;
+
+    /**
+     * 公司编码
+     */
+    private String companyCode;
+
+    /**
+     * 组织名
+     */
+    private String orgName;
+
+    /**
+     * 小程序名
+     */
+    private String miniAppName;
+
+    /**
+     * 合同编号
+     */
+    private Integer contractId;
+
+    /**
+     * 合同名
+     */
+    private String contractName;
+
+    /**
+     * 渠道代理商
+     */
+    private String channelProxyName;
+
+    /**
+     * 是否结算
+     */
+    private Boolean settlement;
+
+    /**
+     * 甲方签署开始时间
+     */
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryStartTime;
+
+    /**
+     * 甲方签署结束时间
+     */
+
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryEndTime;
+
+    /**
+     * 结算开始时间
+     */
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementStartTime;
+
+    /**
+     * 结算结束时间
+     */
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementEndTime;
+}

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;
 
     /**
      * 点赞置业卡片
@@ -473,6 +473,12 @@ public class CommConstant {
      */
     public static final String MESSAGE_CONTENT_OF_HOUSE = "house";
 
+    /**
+     * 合同签订通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTRACT_SIGNING = "contract-signing";
+
     /**
      * 活动以结束
      */
@@ -738,4 +744,74 @@ public class CommConstant {
      * 样例类型H5
      */
     public static final String NOTICE_TYPE_H5 = "H5";
+
+    /**
+     * 法大大账户类型  2 企业
+     */
+    public static final String ACCOUNT_TYPE_COMPANY = "2";
+
+    /**
+     * 企业在法大大的状态  已注册
+     */
+    public static final String CERTIFIED_STATUS_REGISTERED = "registered";
+
+    /**
+     * 企业在法大大的状态  认证中
+     */
+    public static final String CERTIFIED_STATUS_CERTIFICATION = "certification";
+
+    /**
+     * 企业认证人员的身份 法人
+     */
+    public static final String COMPANY_MANAGER_TYPE_LEGAL = "legal";
+
+
+    /**
+     * 企业认证人员的身份 代理人
+     */
+    public static final String COMPANY_MANAGER_TYPE_AGENT = "agent";
+
+    /**
+     * 企业认证人员的身份 1 法人
+     */
+    public static final String COMPANY_PRINCIPAL_TYPE_LEGAL = "1";
+
+    /**
+     * 企业认证人员的身份 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 AUTO_UNAUTH_STATUS = "3001";
+
+    public static final String  AUTH_SUCCESS_DESC = "签章成功";
+
+    /**
+     * 审核通过
+     */
+    public static final Integer STATUS_VERIFY_PASS = 4;
 }

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.common;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class CommonUtils {
+    /**
+     * 金额校验
+     *
+     * @param str
+     * @return
+     */
+    public static boolean isAmount(String str) {
+        Pattern pattern = Pattern.compile("^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$"); // 判断小数点后2位的数字的正则表达式
+        Matcher match = pattern.matcher(str);
+        if (match.matches() == false) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+@ConfigurationProperties(prefix = "fadada")
+public class FadadaProperties {
+    private String appId;
+    private String appSecret;
+    private String version;
+    private String authServeHost;
+    private String serveHost;
+    private String companyNotify;
+    private String authReturnUrl;
+    private String authNotifyUrl;
+    private String signNotify;
+    private String redirectUrl;
+}

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

@@ -368,7 +368,7 @@ public class TaBuildingController extends BaseController {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id, person.getPersonId(), orgId);
+        return taBuildingService.buildingAllSelectId(id, person, orgId);
     }
 
     /**

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

@@ -59,6 +59,15 @@ public class TaHousingResourcesController extends BaseController {
     @Autowired
     public ITaSalesBatchService taSalesBatchService;
 
+    @Autowired
+    private ITaRaiseService iTaRaiseService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Autowired
+    private ITaRaiseInviteService iTaRaiseInviteService;
+
     /**
      * 分页查询列表
      *
@@ -240,12 +249,35 @@ public class TaHousingResourcesController extends BaseController {
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
         String personId = getPersonId(request);
-
+        List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
         logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{},source:{}",
                 orgId, salesBatchId, startPrice, endPrice, apartmentId, source);
 
         try {
+            // 查询批次下认筹是否开启邀请制
+            QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+            taRaiseQueryWrapper.eq("org_id", orgId);
+            taRaiseQueryWrapper.eq("sales_batch_id", salesBatchId);
+            taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            TaRaise taRaise = iTaRaiseService.getOne(taRaiseQueryWrapper);
+
+            if (null != taRaise && CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+                // 若开启邀请制，校验该用户是否在邀请列表中
+                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+                taRaiseInviteQueryWrapper.eq("org_id", orgId);
+                taRaiseInviteQueryWrapper.eq("invite_tel", person.getPhone());
+                taRaiseInviteQueryWrapper.eq("sales_batch_id", salesBatchId);
+                TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+                if (null == taRaiseInvite) {
+                    return ResponseBean.error("仅限被邀请用户查看房源",ResponseBean.ERROR_ILLEGAL_PARAMS);
+                }
+            }
             //获取所有楼房的预选热度和认筹热度
             List<TaHousingResourcesPO> taHousingResourcesPOList = iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, personId, source);
             //此处处理我的预选，我的认筹，和我的锁定
@@ -378,8 +410,8 @@ public class TaHousingResourcesController extends BaseController {
             }
             responseBean.addError("当前房源已下架");
         } catch (Exception e) {
-            logger.error("getHousingDetailById -=- {}", e);
-            responseBean.addError(e.getMessage());
+            logger.error("根据房源ID获取房源详情 -=- {}", e);
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         return responseBean;
     }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.controller;
 
+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;
@@ -14,8 +15,8 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
-    * 公司表  前端控制器
-    * </p>
+ * 公司表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-09-11
@@ -32,25 +33,26 @@ public class TaOrgController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/center/taOrg",method= RequestMethod.GET)
-    public ResponseBean taOrgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/center/taOrg", method = RequestMethod.GET)
+    public ResponseBean taOrgList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
+            IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaOrg> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaOrg> result = iTaOrgService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgList -=- {}",e.toString());
+            logger.error("taOrgList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +60,22 @@ public class TaOrgController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/center/taOrg",method= RequestMethod.POST)
-    public ResponseBean taOrgAdd(@RequestBody TaOrg taOrg){
+    @RequestMapping(value = "/center/taOrg", method = RequestMethod.POST)
+    public ResponseBean taOrgAdd(@RequestBody TaOrg taOrg) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaOrgService.save(taOrg)){
+            if (iTaOrgService.save(taOrg)) {
                 responseBean.addSuccess(taOrg);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgAdd -=- {}",e.toString());
+            logger.error("taOrgAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +83,22 @@ public class TaOrgController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taOrg/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taOrgDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taOrg/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taOrgDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaOrgService.removeById(id)){
+            if (iTaOrgService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgDelete -=- {}",e.toString());
+            logger.error("taOrgDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,24 +106,25 @@ public class TaOrgController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id    实体ID
      * @param taOrg 实体对象
      * @return
      */
-    @RequestMapping(value="/taOrg/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taOrg/{id}", method = RequestMethod.PUT)
     public ResponseBean taOrgUpdate(@PathVariable Integer id,
-                                        @RequestBody TaOrg taOrg){
+                                    @RequestBody TaOrg taOrg) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taOrg.setOrgId(id);
-            if (iTaOrgService.updateById(taOrg)){
+            if (iTaOrgService.updateById(taOrg)) {
                 responseBean.addSuccess(taOrg);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgUpdate -=- {}",e.toString());
+            logger.error("taOrgUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -127,16 +132,41 @@ public class TaOrgController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/center/taOrg/{id}",method= RequestMethod.GET)
-    public ResponseBean taOrgGet(@PathVariable Integer id){
+    @RequestMapping(value = "/center/taOrg/{id}", method = RequestMethod.GET)
+    public ResponseBean taOrgGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaOrgService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taOrgDelete -=- {}",e.toString());
+            logger.error("taOrgDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询组织列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    @RequestMapping(value = "/api/channel/contract/listOrg", method = RequestMethod.GET)
+    public ResponseBean listOrgForContract(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           String orgName, String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgService.listOrgForContract(pageNum, pageSize, orgName, miniAppName);
+            logger.info("TaOrgController.listOrgForContract 返回结果：", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaOrgController.listOrgForContract 异常:", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaRaiseInvite;
 import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.service.ITaRaiseService;
-import com.huiju.estateagents.service.ITaSalesBatchService;
-import com.huiju.estateagents.service.ITaSaveService;
-import com.huiju.estateagents.service.ITdCityService;
+import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.impl.TaRaiseInviteServiceImpl;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,6 +49,9 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITaSalesBatchService iTaSalesBatchService;
 
+    @Autowired
+    private TaRaiseInviteServiceImpl iTaRaiseInviteService;
+
     /**
      * 获取认筹列表
      *
@@ -136,27 +141,29 @@ public class TaRaiseController extends BaseController {
                 return responseBean;
             }
 
-            //获取销售批次状态
+            // 获取销售批次状态
             TaSalesBatch taSalesBatch = new TaSalesBatch();
-            if (taRaise.getSalesBatchId() != null){
+            if (taRaise.getSalesBatchId() != null) {
                 QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
                 taSalesBatchQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
                 taSalesBatch = iTaSalesBatchService.getOne(taSalesBatchQueryWrapper);
-
             }
 
             taRaise.setOrgId(orgId);
-            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null );
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
             taRaise.setStatus(taSalesBatch.getStatus());
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
+                // 为邀请制，添加认筹被邀请清单
+                if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+                    iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), true);
+                }
                 responseBean.addSuccess(taRaise);
             } else {
                 responseBean.addError("fail");
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("taRaiseAdd -=- {}", e.toString());
+            logger.error("taRaiseAdd -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -217,7 +224,8 @@ public class TaRaiseController extends BaseController {
      */
     @RequestMapping(value = "/admin/taRaise/{id}", method = RequestMethod.PUT)
     public ResponseBean taRaiseUpdate(@PathVariable Integer id,
-                                      @RequestBody TaRaise taRaise) {
+                                      @RequestBody TaRaise taRaise,
+                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             Integer raisePrice = taRaise.getRaisePrice();
@@ -229,6 +237,10 @@ public class TaRaiseController extends BaseController {
             taRaise.setRaiseId(id);
             taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
             if (iTaRaiseService.updateById(taRaise)) {
+                // 为邀请制，添加认筹被邀请清单
+                if (CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+                    iTaRaiseService.saveOrUpdateInvite(taRaise, getOrgId(request), false);
+                }
                 responseBean.addSuccess(taRaise);
             } else {
                 responseBean.addError("fail");

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.huiju.estateagents.service.ITaRaiseInviteService;
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 认筹被邀请清单  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@RestController
+@RequestMapping("/")
+public class TaRaiseInviteController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaRaiseInviteController.class);
+
+    @Autowired
+    public ITaRaiseInviteService iTaRaiseInviteService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taRaiseInvite",method= RequestMethod.GET)
+    public ResponseBean taRaiseInviteList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaRaiseInvite> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaRaiseInvite> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaRaiseInvite> result = iTaRaiseInviteService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taRaiseInvite 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRaiseInvite",method= RequestMethod.POST)
+    public ResponseBean taRaiseInviteAdd(@RequestBody TaRaiseInvite taRaiseInvite){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseInviteService.save(taRaiseInvite)){
+                responseBean.addSuccess(taRaiseInvite);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taRaiseInvite/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taRaiseInviteDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaRaiseInviteService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taRaiseInvite 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taRaiseInvite/{id}",method= RequestMethod.PUT)
+    public ResponseBean taRaiseInviteUpdate(@PathVariable Integer id,
+                                        @RequestBody TaRaiseInvite taRaiseInvite){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaRaiseInviteService.updateById(taRaiseInvite)){
+                responseBean.addSuccess(taRaiseInvite);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taRaiseInvite/{id}",method= RequestMethod.GET)
+    public ResponseBean taRaiseInviteGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaRaiseInviteService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taRaiseInviteDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -163,7 +163,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param raiseRecord
      * @return
      */
-    @RequestMapping(value = "/admin/raise/checkBeforeInvalidRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/raise/checkBeforeInvalidRecord", method = RequestMethod.POST)
     public ResponseBean checkBeforeInvalidRecord(@RequestBody TaRaiseRecord raiseRecord) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -229,7 +229,7 @@ public class TaRaiseRecordController extends BaseController {
                 iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED, record.getPersonId());
 
                 // 发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getPersonId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -280,7 +280,7 @@ public class TaRaiseRecordController extends BaseController {
                 iTaRaiseRecordService.updateHouseLockingStatus(record.getRaiseRecordId(), CommConstant.HOUSE_LOCKING_STATUS_UNLOCKED, record.getPersonId());
 
                 // 发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getPersonId(), "认筹通知", "认筹单已作废", "点击详情查看认筹单", "具体原因查看详情", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -302,7 +302,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/admin/raise/checkBeforePayOfflineRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/raise/checkBeforePayOfflineRecord", method = RequestMethod.POST)
     public ResponseBean checkBeforePayOfflineRecord(@RequestBody TaRaiseRecord raiseRecord, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -398,7 +398,7 @@ public class TaRaiseRecordController extends BaseController {
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
                 record.setUpdateDate(LocalDateTime.now());
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹已缴费", "点击详情查看认筹单", "您的认筹已成功缴费", false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getPersonId(), "认筹通知", "认筹已缴费", "点击详情查看认筹单", "您的认筹已成功缴费", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -419,7 +419,7 @@ public class TaRaiseRecordController extends BaseController {
      * @param raiseRecord
      * @return
      */
-    @RequestMapping(value = "/admin/raise/checkBeforeRefundOfflineRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/raise/checkBeforeRefundOfflineRecord", method = RequestMethod.POST)
     public ResponseBean checkBeforeRefundOfflineRecord(@RequestBody TaRaiseRecord raiseRecord) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -506,7 +506,7 @@ public class TaRaiseRecordController extends BaseController {
                 record.setRefundReason(raiseRecord.getRefundReason());
                 record.setUpdateDate(LocalDateTime.now());
                 //发送订阅消息
-                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getRaiseId(), "认筹通知", "认筹已退费", "点击详情查看认筹单", "您的认筹已成功退费", false);
+                iTaRaiseRecordService.sendRaiseMsg(record.getRaiseRecordId(), record.getPersonId(), "认筹通知", "认筹已退费", "点击详情查看认筹单", "您的认筹已成功退费", false);
             });
 
             if (iTaRaiseRecordService.updateBatchById(raiseRecord.getTaRaiseRecords())) {
@@ -659,69 +659,7 @@ public class TaRaiseRecordController extends BaseController {
     public ResponseBean wxGetRaiseRecordById(@PathVariable Integer raiseRecordId, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            //获取认筹单信息
-            TaRaiseRecord taRaiseRecord = iTaRaiseRecordService.getById(raiseRecordId);
-
-            String personId = getPersonId(request);
-            //认筹表数据
-            TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
-            taRaise.setRaisePrice(taRaise.getRaisePrice());
-            //置业顾问信息
-            TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
-            if (null != consultantInfo) {
-                //职业顾问信息
-                TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
-                if (null != consultantPerson) {
-                    consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
-                }
-            }
-
-            taRaiseRecord.setConsultantInfo(consultantInfo);
-            //房源与认筹单关系图
-            List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
-
-            //房源信息
-            List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
-
-            //我的认筹和锁定
-            houseList.forEach(e -> {
-                taRaiseHouseList.forEach(r -> {
-                    //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
-                        e.setMineLocked("mine");
-                    }
-                });
-
-                //塞入户型信息
-                if (!StringUtils.isEmpty(e.getApartmentId())) {
-                    TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
-                    e.setApartmentName(buildingApartment.getApartmentName());
-                    e.setInsideArea(buildingApartment.getInsideArea());
-                    e.setBuildingArea(buildingApartment.getBuildingArea());
-                    //塞入户型图信息
-                    List<String> apartMentIds = new ArrayList<>();
-                    apartMentIds.add(e.getApartmentId());
-                    List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
-                    e.setApartmentImgList(apartMentList);
-                }
-            });
-
-            Map<String, Object> map = new HashMap<>();
-            map.put("refundOrder", null);
-            //订单信息
-            TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
-            if (null != taOrder) {
-                //退费信息
-                TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
-                map.put("refundOrder", refundOrder);
-            }
-            map.put("taRaiseRecord", taRaiseRecord);
-            map.put("taRaiseHouseList", taRaiseHouseList);
-            map.put("houseList", houseList);
-            map.put("taOrder", taOrder);
-
-            map.put("taRaise", taRaise);
-            responseBean.addSuccess(map);
+            responseBean = iTaRaiseRecordService.wxGetRaiseRecordById(raiseRecordId, getPersonId(request), getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("微信端获取认筹单详细信息 -=- {}", e.toString());

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

@@ -0,0 +1,634 @@
+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;
+import com.fadada.sdk.client.FddClientBase;
+import com.fadada.sdk.client.authForfadada.FindCertInfo;
+import com.huiju.estateagents.base.BaseController;
+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.eContract.service.impl.TaCompanySealUtil;
+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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.huiju.estateagents.eContract.service.ITaCompanyService;
+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.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+/**
+ * <p>
+ * 企业认证表  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaCompanyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCompanyController.class);
+
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
+    @Autowired
+    public ITaCompanyService iTaCompanyService;
+
+    @Autowired
+    private ITaCompanySealService iTaCompanySealService;
+
+    @Autowired
+    private ITaContractService iTaContractService;
+
+    @Autowired
+    public ITaContractUserService iTaContractUserService;
+
+    @Autowired
+    private TaMiniappServiceImpl taMiniappService;
+
+    @Autowired
+    private TaCompanySealUtil taCompanySealUtil;
+
+
+    /**
+     * 条件查询企业列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @param companyCode
+     * @param certifiedStatus
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/listCompany", method = RequestMethod.GET)
+    public ResponseBean listCompany(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                   String companyName, String companyCode, String certifiedStatus) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
+            queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
+            queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
+            queryWrapper.eq("status", 4);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            logger.error("listCompany -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询企业列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @return
+     */
+    @RequestMapping(value = "/admin/taCompanyList", method = RequestMethod.GET)
+    public ResponseBean companyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                   String companyName, String companyCode, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            IPage<TaCompany> result = iTaCompanyService.selectListByOrgId(pg, companyName, companyCode, getOrgId(request));
+            List<TaCompany> taCompanyList = result.getRecords();
+            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);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询企业列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @return
+     */
+    @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", 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 {
+            //使用分页插件
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            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(status), "status", status);
+            if (CommConstant.AUTO_AUTH_STATUS.equals(authorizeStatus)){
+                queryWrapper.eq(StringUtils.isNotBlank(authorizeStatus), "authorize_status", authorizeStatus);
+            }
+            if (CommConstant.AUTO_UNAUTH_STATUS.equals(authorizeStatus)){
+                queryWrapper.nested(i -> i.eq("authorize_status", CommConstant.AUTO_UNAUTH_STATUS).or().isNull("authorize_status"));
+            }
+
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
+            List<TaCompany> taCompanyList = result.getRecords();
+            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);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taCompany 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taCompany", method = RequestMethod.POST)
+    public ResponseBean taCompanyAdd(@RequestBody TaCompany taCompany) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCompanyService.save(taCompany)) {
+                responseBean.addSuccess(taCompany);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taCompany/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taCompanyDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCompanyService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id        实体ID
+     * @param taCompany 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taCompany/{id}", method = RequestMethod.PUT)
+    public ResponseBean taCompanyUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCompany taCompany) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCompanyService.updateById(taCompany)) {
+                responseBean.addSuccess(taCompany);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/taCompany/{id}", method = RequestMethod.GET)
+    public ResponseBean taCompanyGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaCompany taCompany = iTaCompanyService.getCompanyAndContractInfo(id);
+            responseBean.addSuccess(taCompany);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 条件查询企业列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @param companyCode
+     * @param status
+     * @return
+     */
+    @RequestMapping(value = "/channel/company/list", method = RequestMethod.GET)
+    public ResponseBean getCompanyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "companyName", required = false) String companyName,
+                                       @RequestParam(value = "companyCode", required = false) String companyCode,
+                                       @RequestParam(value = "status", required = false) String status) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
+            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(status), "status", status);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 第一次自动创建企业信息
+     */
+    @RequestMapping(value = "/channel/company/add", method = RequestMethod.POST)
+    public ResponseBean addCompanyFirstInfo() {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaCompany taCompany = iTaCompanyService.newFirstCompanyInfo();
+            responseBean.addSuccess(taCompany);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/company/{id}", method = RequestMethod.GET)
+    public ResponseBean getCompanyInfo(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCompanyService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id更新数据
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/company/{id}", method = RequestMethod.PUT)
+    public ResponseBean updateCompanyInfo(@PathVariable Integer id,@RequestBody TaCompany taCompany) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taCompany.setCompanyId(id);
+            TaCompany newCompany = iTaCompanyService.updateCompanyInfo(taCompany);
+            responseBean.addSuccess(newCompany);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id去法大大那边拿最新数据然后更新
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/channel/company/fdd/{id}", method = RequestMethod.GET)
+    public ResponseBean updateCompanyInfoByFdd(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaCompany newCompany = iTaCompanyService.updateCompanyInfoByFdd(id);
+            responseBean.addSuccess(newCompany);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id更新数据
+     *
+     * @param
+     */
+    @RequestMapping(value = "/channel/company/delete", method = RequestMethod.DELETE)
+    public ResponseBean updateCompanyInfo(@RequestBody String ids) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            int successNum = 0;
+            int failNum = 0;
+            JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
+            for (Object id : jsonArray) {
+                TaCompany company = iTaCompanyService.getById((Integer) id);
+                if (!CommConstant.STATUS_VERIFY_PASS.equals(company.getStatus())){
+                    company.setStatus(CommConstant.STATUS_DELETE);
+                    iTaCompanyService.updateById(company);
+                    successNum++;
+                }else{
+                    failNum++;
+                }
+            }
+            Map<String,Object> map = new HashMap<>();
+            map.put("successNum",successNum);
+            map.put("failNum",failNum);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 企业认证回调函数
+     *
+     */
+    @RequestMapping(value = "/fadd/company", method = RequestMethod.POST)
+    public void faddCompanyNotify(@RequestParam(value = "serialNo",required = false) String serialNo,
+                                  @RequestParam(value = "authenticationType",required = false) String authenticationType,
+                                  @RequestParam(value = "status",required = false) String status,
+                                  HttpServletRequest request) {
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        logger.info("企业认证回调函数参数:交易号{}，认证类型{}，状态，{}, 人员名称{}",serialNo,authenticationType,status);
+        //企业认证
+        if ("2".equals(authenticationType)){
+            QueryWrapper<TaCompany> taCompanyQueryWrapper = new QueryWrapper<>();
+            taCompanyQueryWrapper.eq("certified_serial_number",serialNo);
+            TaCompany taCompany = iTaCompanyService.getOne(taCompanyQueryWrapper);
+
+            try {
+                //更新企业状态
+                iTaCompanyService.updateCompanyInfoByFdd(taCompany.getCompanyId());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else if ("1".equals(authenticationType)){
+            QueryWrapper<TaContractUser> taContractUserQueryWrapper = new QueryWrapper<>();
+            taContractUserQueryWrapper.eq("certified_serial_number",serialNo);
+            TaContractUser taContractUser = iTaContractUserService.getOne(taContractUserQueryWrapper);
+            taContractUser.setStatus(Integer.valueOf(status));
+//            //如果状态是失败的情况下就发送短信  先注释如果没问题就删除
+//            if (status.equals("1")){
+//                logger.info("发送短信");
+//                //获取个人信息
+//                logger.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");
+//                logger.info("个人最新数据结果 {}",result);
+//                JSONObject jsonObject = JSONObject.parseObject(result);
+//                //更新数据
+//                String data = jsonObject.getString("data");
+//                if (null !=data){
+//                    JSONObject dataJson = JSONObject.parseObject(data);
+//                    //个人信息
+//                    JSONObject personJson = dataJson.getJSONObject("person");
+//                    if (null != personJson){
+//                        taCompanySealUtil.sendFddSms(taContractUser.getCertifiedAddress(),personJson.getString("mobile"));
+//                    }
+//                }
+//
+//            }
+            taContractUser.setAuthStatus("autoSign");
+            iTaContractUserService.updateById(taContractUser);
+        }
+    }
+
+    /**
+     * 自动授权签章回调
+     */
+    @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);
+        }
+    }
+
+    /**
+     * 自动签章授权
+     */
+    @RequestMapping(value = "/channel/company/autoAuthCompany/{id}", method = RequestMethod.PUT)
+    public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request));
+        TaCompany taCompany = new TaCompany();
+        taCompany.setCompanyId(id);
+        taCompany.setAuthorizeAddress(res);
+        iTaCompanyService.updateById(taCompany);
+        responseBean.addSuccess((Object)res);
+        return responseBean;
+    }
+
+    /**
+     * 设置默认章
+     */
+    @RequestMapping(value = "/channel/company/setDefaultSeal/{id}", method = RequestMethod.POST)
+    public ResponseBean setDefaultSeal(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
+        TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+        String res = taCompanySealUtil.setDefaultSeal(taCompanySeal.getSignatureId(), taCompany.getFadadaCode());
+        JSONObject result = JSONObject.parseObject(res);
+        if ((Integer) result.get("code") != 1){
+            responseBean.addError(result.getString("msg"));
+            return responseBean;
+        }
+        //更新旧的印章为否
+        QueryWrapper<TaCompanySeal> taCompanySealQueryWrapper = new QueryWrapper<>();
+        taCompanySealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+        taCompanySealQueryWrapper.eq("default_seal", CommConstant.STATUS_NORMAL);
+        TaCompanySeal oldDefaultSeal = iTaCompanySealService.getOne(taCompanySealQueryWrapper);
+        if (oldDefaultSeal != null){
+            oldDefaultSeal.setDefaultSeal(CommConstant.STATUS_UNACCALIMED);
+            iTaCompanySealService.updateById(oldDefaultSeal);
+        }
+
+        //更新默认章
+        taCompanySeal.setDefaultSeal(CommConstant.STATUS_NORMAL);
+        iTaCompanySealService.updateById(taCompanySeal);
+
+
+        responseBean.addSuccess(result.getString("msg"));
+        return responseBean;
+    }
+
+
+    /**
+     * 手动签署回调函数
+     *
+     */
+    @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,
+                                  @RequestParam(value = "result_desc",required = false) String result_desc,
+                                  @RequestParam(value = "download_url",required = false) String download_url,
+                                  @RequestParam(value = "viewpdf_url",required = false) String viewpdf_url,
+                                  @RequestParam(value = "timestamp",required = false) String timestamp,
+                                  @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);
+        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.setCustomerTime(LocalDateTime.now());
+            taContract.setReason(parameterMap.get("result_desc")[0]);
+
+            //自动归档
+            FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+            String result = base.invokeContractFilling(taContract.getContractId().toString());
+            logger.info("合同归档结果{}",result);
+            taContract.setArchives(true);
+            taContract.setArchivesTime(LocalDateTime.now());
+            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);
+        }
+    }
+
+    /**
+     * 查询授权状态接口
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/channel/company/getAuthStatus/{id}", method = RequestMethod.GET)
+    public ResponseBean getAuthStatus(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String res = iTaCompanyService.getAuthStatus(id);
+        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/TaCompanyOrgController.java

@@ -0,0 +1,204 @@
+package com.huiju.estateagents.eContract.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
+import com.huiju.estateagents.eContract.service.ITaCompanyOrgService;
+import org.apache.commons.lang3.StringUtils;
+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;
+
+/**
+ * <p>
+ * 企业和组织关系表  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaCompanyOrgController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCompanyOrgController.class);
+
+    @Autowired
+    public ITaCompanyOrgService iTaCompanyOrgService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/taCompanyOrg", method = RequestMethod.GET)
+    public ResponseBean taCompanyOrgList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCompanyOrg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompanyOrg> result = iTaCompanyOrgService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyOrgList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taCompanyOrg 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/taCompanyOrg", method = RequestMethod.POST)
+    public ResponseBean taCompanyOrgAdd(@RequestBody TaCompanyOrg taCompanyOrg) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            // 校验参数
+            if (taCompanyOrg.getOrgId() == null || taCompanyOrg.getCompanyId() == null) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+
+            // 校验企业是否已经关联组织
+            QueryWrapper<TaCompanyOrg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",taCompanyOrg.getOrgId());
+            queryWrapper.eq("company_id",taCompanyOrg.getCompanyId());
+            TaCompanyOrg companyOrg = iTaCompanyOrgService.getOne(queryWrapper);
+            if(companyOrg != null){
+                responseBean.addError("所选企业已关联了所选组织，不能重复关联");
+                return responseBean;
+            }
+
+            taCompanyOrg.setCreateDate(LocalDateTime.now());
+            if (iTaCompanyOrgService.save(taCompanyOrg)) {
+                responseBean.addSuccess(taCompanyOrg);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyOrgAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/channel/taCompanyOrg/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taCompanyOrgDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCompanyOrgService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyOrgDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id           实体ID
+     * @param taCompanyOrg 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taCompanyOrg/{id}", method = RequestMethod.PUT)
+    public ResponseBean taCompanyOrgUpdate(@PathVariable Integer id,
+                                           @RequestBody TaCompanyOrg taCompanyOrg) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCompanyOrgService.updateById(taCompanyOrg)) {
+                responseBean.addSuccess(taCompanyOrg);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyOrgUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/taCompanyOrg/{id}", method = RequestMethod.GET)
+    public ResponseBean taCompanyOrgGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCompanyOrgService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyOrgDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 条件查询公司组织列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName
+     * @param companyCode
+     * @param certifiedStatus
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/listCompanyOrg", method = RequestMethod.GET)
+    public ResponseBean listCompanyAndOrg(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                          String companyName,
+                                          String companyCode,
+                                          String certifiedStatus,
+                                          Integer companyStatus,
+                                          String orgName,
+                                          String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaCompanyOrgService.listCompanyOrg(pageNum, pageSize, companyName, companyCode, certifiedStatus,companyStatus, orgName, miniAppName);
+            logger.info("TaCompanyOrgController.listCompanyOrg 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaCompanyOrgController.listCompanyOrg 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,251 @@
+package com.huiju.estateagents.eContract.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.eContract.entity.TaCompany;
+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;
+
+/**
+ * <p>
+    * 公司印章  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaCompanySealController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCompanySealController.class);
+
+    @Autowired
+    public ITaCompanySealService iTaCompanySealService;
+
+    @Autowired
+    private ITaCompanyService iTaCompanyService;
+
+    @Autowired
+    private TaCompanySealUtil taCompanySealUtil;
+
+    @Autowired
+    private TaMiniappServiceImpl taMiniappService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taCompanySeal",method= RequestMethod.GET)
+    public ResponseBean taCompanySealList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="sealName", required = false) String sealName,
+                                          @RequestParam(value ="companyId", required = false) String companyId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    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.eq(!StringUtils.isEmpty(companyId), "company_id", companyId);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taCompanySeal",method= RequestMethod.GET)
+    public ResponseBean channelCompanySealList(
+                                          @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="companyId", required = false) String companyId,
+                                          @RequestParam(value ="sealName", required = false) String sealName){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaCompanySeal> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("company_id", companyId);
+            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);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCompanySeal 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/taCompanySeal",method= RequestMethod.POST)
+    public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
+            JSONObject params = JSONObject.parseObject(result);
+            if ((Integer) params.get("code") != 1){
+                responseBean.addError(params.get("msg").toString());
+                return responseBean;
+            }
+
+            String data = params.getString("data");
+            taCompanySeal.setCreateDate(LocalDateTime.now());
+            taCompanySeal.setStatus(CommConstant.STATUS_NORMAL);
+            taCompanySeal.setSignatureId(JSONObject.parseObject(data).getString("signature_id"));
+            if (iTaCompanySealService.save(taCompanySeal)){
+                responseBean.addSuccess(taCompanySeal);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/deleteCompanySeal/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCompanySealDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
+            TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
+            JSONObject params = JSONObject.parseObject(res);
+            Integer code = (Integer) params.get("code");
+            if (code != 1){
+                responseBean.addError(params.getString("msg"));
+                return responseBean;
+            }
+
+            TaCompanySeal delInfo = new TaCompanySeal();
+            delInfo.setSealId(id);
+            delInfo.setStatus(CommConstant.STATUS_DELETE);
+            if(iTaCompanySealService.updateById(delInfo)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCompanySeal 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/taCompanySeal/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCompanySealUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+            TaCompanySeal sealInfo = iTaCompanySealService.getById(id);
+            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg());
+            JSONObject params = JSONObject.parseObject(res);
+            Integer code = (Integer) params.get("code");
+            if (code != 1){
+                responseBean.addError(params.getString("msg"));
+                return responseBean;
+            }
+            taCompanySeal.setSealId(id);
+            if (iTaCompanySealService.updateById(taCompanySeal)){
+                responseBean.addSuccess(taCompanySeal);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/taCompanySeal/{id}",method= RequestMethod.GET)
+    public ResponseBean taCompanySealGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCompanySealService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询公司授权对象信息
+     * @param id  实体ID
+     */
+    @RequestMapping(value = "/channel/companySignInfo/id")
+    public ResponseBean companySignInfoByCompanyId(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCompanySealDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,243 @@
+package com.huiju.estateagents.eContract.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.eContract.entity.TaCompany;
+import com.huiju.estateagents.eContract.entity.TaCompanySeal;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.huiju.estateagents.eContract.entity.TaContractTemplate;
+import com.huiju.estateagents.eContract.service.ITaCompanySealService;
+import com.huiju.estateagents.eContract.service.ITaCompanyService;
+import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
+import com.huiju.estateagents.eContract.service.ITaContractTemplateService;
+import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.mapper.TaRaiseMapper;
+import com.huiju.estateagents.sample.entity.TaContact;
+import com.huiju.estateagents.service.ITaRaiseService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import sun.util.locale.LocaleObjectCache;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 合同与业务关系表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaContractBusinessController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaContractBusinessController.class);
+
+    @Autowired
+    public ITaContractBusinessService iTaContractBusinessService;
+
+    @Autowired
+    private ITaContractTemplateService iTaContractTemplateService;
+
+    @Autowired
+    private TaRaiseMapper taRaiseMapper;
+
+    @Autowired
+    private ITaCompanyService iTaCompanyService;
+
+    @Autowired
+    private ITaCompanySealService iTaCompanySealService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taContractBusiness",method= RequestMethod.GET)
+    public ResponseBean taContractBusinessList(@RequestParam(value ="contractName", required = false) String contractName,
+                                               @RequestParam(value ="targetType", required = false) String targetType,
+                                               @RequestParam(value ="targetName", required = false) String targetName,
+                                               @RequestParam(value ="companyName", required = false) String companyName,
+                                               @RequestParam(value ="status", required = false) Integer status,
+                                               @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            Integer orgId = getOrgId(request);
+            IPage<TaContractBusiness> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContractBusiness> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", orgId);
+            queryWrapper.like(!StringUtils.isEmpty(contractName), "contract_template_name", contractName);
+            queryWrapper.eq(!StringUtils.isEmpty(targetType), "target_type", targetType);
+            queryWrapper.like(!StringUtils.isEmpty(targetName), "target_name", targetName);
+            queryWrapper.like(!StringUtils.isEmpty(companyName), "company_name", companyName);
+            queryWrapper.eq(status != null, "status", status);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+            IPage<TaContractBusiness> result = iTaContractBusinessService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractBusinessList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taContractBusiness 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taContractBusiness",method= RequestMethod.POST)
+    public ResponseBean taContractBusinessAdd(@RequestBody TaContractBusiness taContractBusiness, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaContractTemplate taContractTemplate = iTaContractTemplateService.getById(taContractBusiness.getContractTemplateId());
+            taContractBusiness.setContractTemplateName(taContractTemplate.getContractTemplateName());
+            Integer targetId = taContractBusiness.getTargetId();
+            QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
+            taContractBusinessQueryWrapper.eq("org_id", getOrgId(request));
+            taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taContractBusinessQueryWrapper.eq("target_id", targetId);
+            Integer contractBusinessNum = iTaContractBusinessService.count(taContractBusinessQueryWrapper);
+            if (contractBusinessNum > 0 && CommConstant.STATUS_NORMAL.equals(taContractBusiness.getStatus())){
+                responseBean.addError("所选业务已有发布的业务配置，无法再新增已发布的业务配置");
+                return responseBean;
+            }
+
+            taContractBusiness.setOrgId(getOrgId(request));
+            taContractBusiness.setCreateDate(LocalDateTime.now());
+            taContractBusiness.setUpdateDate(LocalDateTime.now());
+            if (iTaContractBusinessService.save(taContractBusiness)){
+                responseBean.addSuccess(taContractBusiness);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractBusinessAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taContractBusiness/{id}", method= RequestMethod.PUT)
+    public ResponseBean taContractBusinessDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaContractBusinessService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractBusinessDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id批量删除对象
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/batchDelBusinessConfig", method= RequestMethod.PUT)
+    public ResponseBean batchDelBusinessConfig(@RequestBody TaContractBusiness contractBusinesses, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        for (TaContractBusiness taContractBusiness : contractBusinesses.getContractBusinessList()){
+            taContractBusiness.setStatus(CommConstant.STATUS_DELETE);
+        }
+        try{
+            iTaContractBusinessService.updateBatchById(contractBusinesses.getContractBusinessList());
+            responseBean.addSuccess("success");
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError("fail");
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taContractBusiness 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taContractBusiness/{id}",method= RequestMethod.PUT)
+    public ResponseBean taContractBusinessUpdate(@PathVariable Integer id,
+                                        @RequestBody TaContractBusiness taContractBusiness, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaContractTemplate taContractTemplate = iTaContractTemplateService.getById(taContractBusiness.getContractTemplateId());
+            TaRaise taRaise = taRaiseMapper.getRaiseById(taContractBusiness.getTargetId(), getOrgId(request));
+            TaCompany taCompany = iTaCompanyService.getById(taContractBusiness.getCompanyId());
+
+            Integer targetId = taContractBusiness.getTargetId();
+            QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
+            taContractBusinessQueryWrapper.eq("org_id", getOrgId(request));
+            taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            taContractBusinessQueryWrapper.eq("target_id", targetId);
+            taContractBusinessQueryWrapper.ne("contract_business_id", id);
+
+
+            Integer contractBusinessNum = iTaContractBusinessService.count(taContractBusinessQueryWrapper);
+            if (contractBusinessNum > 0 && CommConstant.STATUS_NORMAL.equals(taContractBusiness.getStatus())){
+                responseBean.addError("所选业务已有发布的业务配置，无法再新增已发布的业务配置");
+                return responseBean;
+            }
+
+            taContractBusiness.setContractBusinessId(id);
+            taContractBusiness.setContractTemplateName(taContractTemplate.getContractTemplateName());
+            taContractBusiness.setTargetName(taRaise.getSalesBatchName());
+            taContractBusiness.setCompanyName(taCompany.getCompanyName());
+            taContractBusiness.setUpdateDate(LocalDateTime.now());
+            if (iTaContractBusinessService.updateById(taContractBusiness)){
+                responseBean.addSuccess(taContractBusiness);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractBusinessUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taContractBusiness/{id}",method= RequestMethod.GET)
+    public ResponseBean taContractBusinessGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaContractBusinessService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractBusinessDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,331 @@
+package com.huiju.estateagents.eContract.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fadada.sdk.client.FddClientBase;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
+import com.huiju.estateagents.common.CommonUtils;
+import com.huiju.estateagents.config.FadadaProperties;
+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 com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.util.List;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * 合同列表  前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaContractController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaContractController.class);
+
+    @Autowired
+    private ITaContractService iTaContractService;
+
+    @Autowired
+    private ITaRaiseService iTaRaiseService;
+
+    @Autowired
+    private ITaSalesBatchService iTaSalesBatchService;
+
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
+    /**
+     * 条件查询合同列表 -- admin端
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param contractName
+     * @param archives
+     * @param signatoryName
+     * @param signatoryStatus   甲方是否签署，1是，0否，2全部
+     * @param customerName
+     * @param customerStatus    乙方是否签署，1是，0否，2全部
+     * @param archivesStartDate
+     * @param archivesEndDate
+     * @return
+     */
+    @RequestMapping(value = "/admin/contract/list", method = RequestMethod.GET)
+    public ResponseBean listContractForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             String contractName, Boolean archives,
+                                             String signatoryName, Integer signatoryStatus,
+                                             String customerName, Integer customerStatus,
+                                             @RequestParam(value = "archivesStartDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate archivesStartDate,
+                                             @RequestParam(value = "archivesEndDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate archivesEndDate,
+                                             HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaContractService.listContractForAdmin(pageNum, pageSize, contractName, archives, signatoryName, signatoryStatus, customerName, customerStatus, archivesStartDate, archivesEndDate, getOrgId(request));
+            logger.info("TaContractController.listContractForAdmin 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaContractController.listContractForAdmin 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 条件查询合同列表 -- channel端
+     *
+     * @param requestBO
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/list", method = RequestMethod.GET)
+    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaContractService.listContractForChannel(requestBO);
+            logger.info("TaContractController.listContractForChannel 返回结果:{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("TaContractController.listContractForChannel 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量结算
+     *
+     * @return
+     */
+    @RequestMapping(value = "/channel/contract/batchUpdatePrice", method = RequestMethod.PUT)
+    public ResponseBean batchUpdateSettlementPrice(@RequestBody TaContract taContract) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验参数
+            if (taContract.getPrice() == null) {
+                responseBean.addError("请填写结算金额");
+                return responseBean;
+            }
+
+            // 校验金额是否符合要求
+            if (!CommonUtils.isAmount(taContract.getPrice() + "")) {
+                responseBean.addError("结算金额不符合要求");
+                return responseBean;
+            }
+
+            // 元转分
+            Double price = taContract.getPrice() * 100;
+            taContract.getTaContractList().stream().forEach(record -> {
+                record.setSettlement(true);
+                record.setSettlementPrice(price.intValue());
+                record.setSettlementTime(LocalDateTime.now());
+            });
+            responseBean.addSuccess(iTaContractService.updateBatchById(taContract.getTaContractList()));
+
+        } catch (Exception e) {
+            logger.error("TaContractController.batchUpdateSettlementPrice 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taContract 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taContract", method = RequestMethod.POST)
+    public ResponseBean taContractAdd(@RequestBody TaContract taContract) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaContractService.save(taContract)) {
+                responseBean.addSuccess(taContract);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContractAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taContractDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaContractService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContractDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     *
+     * @param id         实体ID
+     * @param taContract 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/contract/{id}", method = RequestMethod.PUT)
+    public ResponseBean taContractUpdate(@PathVariable Integer id,
+                                         @RequestBody TaContract taContract) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taContract.getArchives() != null && taContract.getArchives()) {
+                taContract.setArchivesTime(LocalDateTime.now());
+            }
+            if (iTaContractService.updateById(taContract)) {
+                FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+                String contract_id = taContract.getContractId().toString();
+                String result = base.invokeContractFilling(contract_id);
+                logger.info("合同归档结果{}",result);
+                responseBean.addSuccess(iTaContractService.getById(taContract.getContractId()));
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContractUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/admin/contract/{id}", method = RequestMethod.GET)
+    public ResponseBean taContractGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaContract taContract = iTaContractService.getById(id);
+            if(taContract != null){
+                TaRaise taRaise = iTaRaiseService.getById(taContract.getTargetId());
+                if(taRaise != null){
+                    TaSalesBatch taSalesBatch = iTaSalesBatchService.getById(taRaise.getSalesBatchId());
+                    if(taSalesBatch != null){
+                        taContract.setTargetName(taSalesBatch.getSalesBatchName());
+                    }
+                }
+            }
+            responseBean.addSuccess(taContract);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContractDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        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;
+    }
+
+
+    /**
+     * 手动签署合同
+     */
+    @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);
+            return ResponseBean.success(signUrl);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 自动签署合同
+     */
+    @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/controller/TaContractTemplateController.java

@@ -0,0 +1,182 @@
+package com.huiju.estateagents.eContract.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.eContract.entity.TaContractTemplate;
+import com.huiju.estateagents.eContract.service.ITaContractTemplateService;
+import org.apache.commons.lang3.StringUtils;
+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;
+import java.util.List;
+
+/**
+ * <p>
+    * 合同模板  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaContractTemplateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaContractTemplateController.class);
+
+    @Autowired
+    public ITaContractTemplateService iTaContractTemplateService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taContractTemplate",method= RequestMethod.GET)
+    public ResponseBean taContractTemplateList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value ="contractTemplateName", required = false) String contractTemplateName,
+                                               HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaContractTemplate> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContractTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.like(!StringUtils.isEmpty(contractTemplateName),"contract_template_name", contractTemplateName);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaContractTemplate> result = iTaContractTemplateService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractTemplateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taContractTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/contract/template/add", method = RequestMethod.POST)
+    public ResponseBean taContractTemplateAdd(@RequestBody TaContractTemplate taContractTemplate,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taContractTemplate.setCreateDate(LocalDateTime.now());
+            taContractTemplate.setStatus(CommConstant.STATUS_NORMAL);
+            taContractTemplate.setOrgId(getOrgId(request));
+            if (iTaContractTemplateService.save(taContractTemplate)) {
+                responseBean.addSuccess(taContractTemplate);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taContractTemplateAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除合同模板
+     *
+     * @param taContractTemplateList
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/contract/template/batchDelete", method = RequestMethod.PUT)
+    public ResponseBean batchDeleteContractTemplate(@RequestBody List<TaContractTemplate> taContractTemplateList) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taContractTemplateList.stream().forEach(record -> {
+                record.setStatus(CommConstant.STATUS_DELETE);
+            });
+            responseBean.addSuccess(iTaContractTemplateService.updateBatchById(taContractTemplateList));
+        } catch (Exception e) {
+            logger.error("batchDeleteContractTemplate -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taContractTemplate/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taContractTemplateDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaContractTemplateService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractTemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taContractTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taContractTemplate/{id}",method= RequestMethod.PUT)
+    public ResponseBean taContractTemplateUpdate(@PathVariable Integer id,
+                                        @RequestBody TaContractTemplate taContractTemplate){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaContractTemplateService.updateById(taContractTemplate)){
+                responseBean.addSuccess(taContractTemplate);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractTemplateUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taContractTemplate/{id}",method= RequestMethod.GET)
+    public ResponseBean taContractTemplateGet(@PathVariable String id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaContractTemplateService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractTemplateDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,206 @@
+package com.huiju.estateagents.eContract.controller;
+
+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.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 com.huiju.estateagents.service.ITaRaiseRecordService;
+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>
+    * 电子合同注册用户表  前端控制器
+    * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@RestController
+@RequestMapping("/api")
+public class TaContractUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaContractUserController.class);
+
+    @Autowired
+    public ITaContractUserService iTaContractUserService;
+
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    private ITaRaiseRecordService taRaiseRecordService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taContractUser",method= RequestMethod.GET)
+    public ResponseBean taContractUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaContractUser> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaContractUser> result = iTaContractUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taContractUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taContractUser",method= RequestMethod.POST)
+    public ResponseBean taContractUserAdd(@RequestBody TaContractUser taContractUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaContractUserService.save(taContractUser)){
+                responseBean.addSuccess(taContractUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractUserAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taContractUser/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taContractUserDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaContractUserService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taContractUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taContractUser/{id}",method= RequestMethod.PUT)
+    public ResponseBean taContractUserUpdate(@PathVariable Integer id,
+                                        @RequestBody TaContractUser taContractUser){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaContractUserService.updateById(taContractUser)){
+                responseBean.addSuccess(taContractUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taContractUser/{id}",method= RequestMethod.GET)
+    public ResponseBean taContractUserGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaContractUserService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContractUserDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        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,taRaiseRecordService.getById(taRaiseRecord.getRaiseRecordId()));
+            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/TaCompany.java

@@ -0,0 +1,173 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 企业认证表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业id
+     */
+    @TableId(value = "company_id", type = IdType.AUTO)
+    private Integer companyId;
+
+    /**
+     * 企业名称
+     */
+    private String companyName;
+
+    /**
+     * 企业编号
+     */
+    private String companyCode;
+
+    /**
+     * 法大大客户编号
+     */
+    private String fadadaCode;
+
+    /**
+     * 认证企业人员的身份 legal法人agent代理人
+     */
+    private String companyManagerType;
+
+    /**
+     * 认证序列号 认证的序列号
+     */
+    private String certifiedSerialNumber;
+
+    /**
+     * 实名认证地址 实名认证地址
+     */
+    private String certifiedAddress;
+
+    /**
+     * 实名认证状态 实名认证状态
+     */
+    private String certifiedStatus;
+
+    /**
+     * 不通过原因
+     */
+    private String reason;
+
+    /**
+     * 审核时间
+     */
+    private LocalDateTime verifyTime;
+
+    /**
+     * 认证方式 认证方式
+     */
+    private Integer certifiedType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态 1有效0无效-1删除
+     */
+    private Integer status;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String creditCode;
+
+    /**
+     * 银行名称
+     */
+    private String bankName;
+
+    /**
+     * 银行帐号
+     */
+    private String bankAccount;
+
+    /**
+     * 开户支行名称
+     */
+    private String subbranchName;
+
+    /**
+     * 姓名
+     */
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    private String tel;
+
+    /**
+     * 身份证号码
+     */
+    private String idCard;
+
+    /**
+     * 自动签章授权状态
+     */
+    private String authorizeStatus;
+
+    /**
+     * 授权类型
+     */
+    private String authorizeType;
+
+    /**
+     * 授权流水号
+     */
+    private String authorizeTransactionId;
+
+    /**
+     * 授权签署地址
+     */
+    private String authorizeAddress;
+
+    /**
+     * 授权合同编号
+     */
+    private String authorizeContractId;
+
+    /**
+     * 自动签章授权结果描述
+     */
+    private String authorizeDescription;
+
+    /**
+     * 授权签署下载地址
+     */
+    private String authorizeDownloadUrl;
+
+    /**
+     * 授权签署查看地址
+     */
+    private String authorizeViewUrl;
+
+    @TableField(exist = false)
+    private Integer sealNum;
+
+    @TableField(exist = false)
+    private String contractId;
+}

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

@@ -0,0 +1,86 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 企业和组织关系表
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCompanyOrg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业和组织关系id
+     */
+    @TableId(value = "company_org_id", type = IdType.AUTO)
+    private Integer companyOrgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+
+    /**
+     * 企业名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 企业编号
+     */
+    @TableField(exist = false)
+    private String companyCode;
+
+    /**
+     * 实名认证状态 实名认证状态
+     */
+    @TableField(exist = false)
+    private String certifiedStatus;
+
+    /**
+     * 组织名称
+     */
+    @TableField(exist = false)
+    private String orgName;
+
+    /**
+     * 小程序名称
+     */
+    @TableField(exist = false)
+    private String miniAppName;
+
+    /**
+     * 认证公司状态
+     */
+    @TableField(exist = false)
+    private Integer companyStatus;
+
+}

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

@@ -0,0 +1,67 @@
+package com.huiju.estateagents.eContract.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * <p>
+ * 公司印章 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCompanySeal implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 印章id
+     */
+    @TableId(value = "seal_id", type = IdType.AUTO)
+    private Integer sealId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+
+    /**
+     * 印章名称
+     */
+    private String sealName;
+
+    /**
+     * 印章图
+     */
+    private String sealImg;
+
+    /**
+     * 状态 1是有效0是无效-1是删除
+     */
+    private Integer status;
+
+    /**
+     * 签章id
+     */
+    private String signatureId;
+
+    /**
+     * 默认章
+     */
+    private Integer defaultSeal;
+}

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

@@ -0,0 +1,202 @@
+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 java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 合同列表
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaContract implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同id
+     */
+    @TableId(value = "contract_id", type = IdType.AUTO)
+    private Integer contractId;
+
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 合同标题
+     */
+    private String contractName;
+
+    /**
+     * 关联业务类型
+     */
+    private String targetType;
+
+    /**
+     * 关联业务
+     */
+    private Integer targetId;
+
+    /**
+     * 关联单据类型
+     */
+    private String invoiceTargetType;
+
+    /**
+     * 关联单据id
+     */
+    private Integer invoiceTargetId;
+
+    /**
+     * 甲方名称
+     */
+    private String signatoryName;
+
+    /**
+     * 甲方签署时间
+     */
+    private LocalDateTime signatoryTime;
+
+    /**
+     * 乙方名称
+     */
+    private String customerName;
+
+    /**
+     * 乙方手机号
+     */
+    private String customerTel;
+
+    /**
+     * 乙方身份证号
+     */
+    private String customerIdcard;
+
+    /**
+     * 乙方签署时间
+     */
+    private LocalDateTime customerTime;
+
+    /**
+     * 下载合同链接地址
+     */
+    private String contractDownloadUrl;
+
+    /**
+     * 查看合同链接地址
+     */
+    private String contractViewUrl;
+
+    /**
+     * 是否归档
+     */
+    private Boolean archives;
+
+    /**
+     * 归档时间
+     */
+    private LocalDateTime archivesTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 是否结算
+     */
+    private Boolean settlement;
+
+    /**
+     * 结算时间
+     */
+    private LocalDateTime settlementTime;
+
+    /**
+     * 结算单价 分请做好转换
+     */
+    private Integer settlementPrice;
+
+    /**
+     * 小程序用户id
+     */
+    private String personId;
+
+    /**
+     * 原因
+     */
+    private String reason;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司名
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+    /**
+     * 公司编码
+     */
+    @TableField(exist = false)
+    private String companyCode;
+
+    /**
+     * 组织名
+     */
+    @TableField(exist = false)
+    private String orgName;
+
+    /**
+     * 小程序名
+     */
+    @TableField(exist = false)
+    private String miniAppName;
+
+    /**
+     * 代理商名称
+     */
+    @TableField(exist = false)
+    private String channelProxyName;
+
+    /**
+     * 前端传的计算价格
+     */
+    @TableField(exist = false)
+    private Double price;
+
+    @TableField(exist = false)
+    private List<TaContract> taContractList;
+
+    @TableField(exist = false)
+    private String targetName;
+
+}

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

@@ -0,0 +1,126 @@
+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 java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 合同与业务关系表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaContractBusiness implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同与业务关系表
+     */
+    @TableId(value = "contract_business_id", type = IdType.AUTO)
+    private Integer contractBusinessId;
+
+    /**
+     * 合同模板id
+     */
+    private String contractTemplateId;
+
+    /**
+     * 合同模板名称
+     */
+    private String contractTemplateName;
+
+    /**
+     * 业务类型 raise房源认筹
+     */
+    private String targetType;
+
+    /**
+     * 业务id raise对应销售批次id
+     */
+    private Integer targetId;
+
+    /**
+     * 业务名称
+     */
+    private String targetName;
+
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+
+    /**
+     * 企业标题
+     */
+    private String companyName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 印章id
+     */
+    private Integer sealId;
+
+    /**
+     * 甲方签章定位关键字
+     */
+    private String signatoryKeywords;
+
+    /**
+     * 甲方签章策略 与法大大一致就行
+     */
+    private String signatoryStrategy;
+
+    /**
+     * 乙方签章定位关键字
+     */
+    private String customerKeywords;
+
+    /**
+     * 乙方签章策略
+     */
+    private String customerStrategy;
+
+    /**
+     * 状态 1是有效0是无效-1是删除
+     */
+    private Integer status;
+
+    @TableField(exist = false)
+    private List<TaContractBusiness> contractBusinessList;
+
+    @TableField(exist = false)
+    private String contractTemplateAddress;
+
+    @TableField(exist = false)
+    private String signatureId;
+
+    @TableField(exist = false)
+    private String fadadaCode;
+}

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

@@ -0,0 +1,62 @@
+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 java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 合同模板 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaContractTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同模板id
+     */
+    @TableId(value = "contract_template_id", type = IdType.AUTO)
+    private Integer contractTemplateId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 合同模板标题
+     */
+    private String contractTemplateName;
+
+    /**
+     * 合同模板地址
+     */
+    private String contractTemplateAddress;
+
+    /**
+     * 状态 1有效0无效-1删除
+     */
+    private Integer status;
+
+    @TableField(exist = false)
+    private List<TaContractTemplate> taContractTemplateList;
+}

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

@@ -0,0 +1,90 @@
+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;
+
+/**
+ * <p>
+ * 电子合同注册用户表 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaContractUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 电子合同用户id
+     */
+    @TableId(value = "contract_user_id", type = IdType.AUTO)
+    private Integer contractUserId;
+
+    /**
+     * 小程序端的openid
+     */
+    private String miniOpenid;
+
+    /**
+     * 认证状态 registered已注册unregistered未注册verify审核中legalize已认证unlegalize未认证
+     */
+    private String authStatus;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 认证失败原因
+     */
+    private String reason;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /** 身份证号 */
+    private String idCard;
+    /** 手机号 */
+    private String tel;
+
+    /** 小程序用户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/TaCompanyMapper.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.eContract.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.eContract.entity.TaCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 企业认证表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Mapper
+@Component
+public interface TaCompanyMapper extends BaseMapper<TaCompany> {
+    TaCompany getCompanyAndContractInfo(@Param("companyId") Integer companyId);
+
+    IPage<TaCompany> selectListByOrgId(IPage<TaCompany> iPage, @Param("companyName") String companyName, @Param("companyCode")String companyCode, @Param("orgId")Integer orgId);
+}

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

@@ -0,0 +1,39 @@
+package com.huiju.estateagents.eContract.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 企业和组织关系表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Mapper
+@Component
+public interface TaCompanyOrgMapper extends BaseMapper<TaCompanyOrg> {
+    /**
+     * 条件查询组织列表
+     *
+     * @param pg
+     * @param companyName
+     * @param companyCode
+     * @param certifiedStatus
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    IPage<TaCompanyOrg> listCompanyAndOrg(IPage<TaCompanyOrg> pg,
+                                          @Param("companyName") String companyName,
+                                          @Param("companyCode") String companyCode,
+                                          @Param("certifiedStatus") String certifiedStatus,
+                                          @Param("companyStatus") Integer companyStatus,
+                                          @Param("orgName") String orgName,
+                                          @Param("miniAppName") String miniAppName);
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.eContract.mapper;
+
+import com.huiju.estateagents.eContract.entity.TaCompanySeal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 公司印章  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Mapper
+public interface TaCompanySealMapper extends BaseMapper<TaCompanySeal> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.eContract.mapper;
+
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 合同与业务关系表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Mapper
+public interface TaContractBusinessMapper extends BaseMapper<TaContractBusiness> {
+
+}

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

@@ -0,0 +1,47 @@
+package com.huiju.estateagents.eContract.mapper;
+
+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>
+ * 合同列表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Mapper
+@Component
+public interface TaContractMapper extends BaseMapper<TaContract> {
+
+    IPage<TaContract> listContractForAdmin(IPage<TaContract> pg,
+                                           @Param("contractName") String contractName,
+                                           @Param("archives") Boolean archives,
+                                           @Param("signatoryName") String signatoryName,
+                                           @Param("signatoryStatus") Integer signatoryStatus,
+                                           @Param("customerName") String customerName,
+                                           @Param("customerStatus") Integer customerStatus,
+                                           @Param("archivesStartDate") LocalDate archivesStartDate,
+                                           @Param("archivesEndDate") LocalDate archivesEndDate,
+                                           @Param("orgId") Integer orgId);
+
+    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/mapper/TaContractTemplateMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.eContract.mapper;
+
+import com.huiju.estateagents.eContract.entity.TaContractTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 合同模板  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Mapper
+public interface TaContractTemplateMapper extends BaseMapper<TaContractTemplate> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.eContract.mapper;
+
+import com.huiju.estateagents.eContract.entity.TaContractUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 电子合同注册用户表  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Mapper
+public interface TaContractUserMapper extends BaseMapper<TaContractUser> {
+
+}

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

@@ -0,0 +1,31 @@
+package com.huiju.estateagents.eContract.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 企业和组织关系表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+public interface ITaCompanyOrgService extends IService<TaCompanyOrg> {
+
+    /**
+     * 条件查询组织和公司关联信息
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param companyName     企业名称
+     * @param companyCode     企业编号
+     * @param certifiedStatus 实名认证状态
+     * @param companyStatus   企业状态
+     * @param orgName         组织名称
+     * @param miniAppName     小程序名称
+     * @return
+     */
+    ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus, Integer companyStatus, String orgName, String miniAppName);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.eContract.service;
+
+import com.huiju.estateagents.eContract.entity.TaCompanySeal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 公司印章  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+public interface ITaCompanySealService extends IService<TaCompanySeal> {
+
+}

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

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.eContract.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.eContract.entity.TaCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.poi.ss.formula.functions.T;
+
+/**
+ * <p>
+ * 企业认证表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+public interface ITaCompanyService extends IService<TaCompany> {
+
+    /**
+     * 在法大大创建一个新的企业信息
+     * @return
+     */
+    TaCompany newFirstCompanyInfo() throws Exception;
+
+    /**
+     * 向法大大申请企业认证
+     * @param taCompany
+     * @return
+     */
+    TaCompany updateCompanyInfo(TaCompany taCompany) throws Exception;
+
+    /**
+     * 向法大大获取最新的企业认证数据
+     * @param id
+     * @return
+     */
+    TaCompany updateCompanyInfoByFdd(Integer id) throws Exception;
+
+    String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception;
+
+    TaCompany getCompanyAndContractInfo(Integer companyId);
+
+    String getAuthStatus(Integer companyId);
+
+    IPage<TaCompany> selectListByOrgId(IPage<TaCompany> iPage, String companyName, String companyCode, Integer orgId);
+}

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.eContract.service;
+
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 合同与业务关系表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+public interface ITaContractBusinessService extends IService<TaContractBusiness> {
+
+}

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

@@ -0,0 +1,75 @@
+package com.huiju.estateagents.eContract.service;
+
+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;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 合同列表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+public interface ITaContractService extends IService<TaContract> {
+
+    /**
+     * 条件查询合同列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param contractName
+     * @param archives
+     * @param signatoryName
+     * @param signatoryStatus
+     * @param customerName
+     * @param customerStatus
+     * @param archivesStartDate
+     * @param archivesEndDate
+     * @param orgId
+     * @return
+     */
+    ResponseBean listContractForAdmin(Integer pageNum, Integer pageSize, String contractName, Boolean archives, String signatoryName, Integer signatoryStatus,
+                                      String customerName, Integer customerStatus, LocalDate archivesStartDate, LocalDate archivesEndDate, Integer orgId);
+
+    /**
+     * 条件查询合同列表
+     *
+     * @param requestBO
+     * @return
+     */
+    ResponseBean listContractForChannel(ContractRecordRequestBO requestBO);
+
+    /**
+     * 企业自动签署合同
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person) throws Exception;
+
+    /**
+     * 手动签署合同
+     * @param taContract
+     * @param person
+     * @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/ITaContractTemplateService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.eContract.service;
+
+import com.huiju.estateagents.eContract.entity.TaContractTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 合同模板  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+public interface ITaContractTemplateService extends IService<TaContractTemplate> {
+
+}

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

@@ -0,0 +1,32 @@
+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>
+ * 电子合同注册用户表  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+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/TaCompanyOrgServiceImpl.java

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.eContract.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.eContract.entity.TaCompanyOrg;
+import com.huiju.estateagents.eContract.mapper.TaCompanyOrgMapper;
+import com.huiju.estateagents.eContract.service.ITaCompanyOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 企业和组织关系表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Service
+public class TaCompanyOrgServiceImpl extends ServiceImpl<TaCompanyOrgMapper, TaCompanyOrg> implements ITaCompanyOrgService {
+
+    @Autowired
+    private TaCompanyOrgMapper taCompanyOrgMapper;
+
+    public ResponseBean listCompanyOrg(Integer pageNum, Integer pageSize, String companyName, String companyCode, String certifiedStatus,
+                                       Integer companyStatus, String orgName, String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 组装分页
+        IPage<TaCompanyOrg> pg = new Page<>(pageNum, pageSize);
+        pg = taCompanyOrgMapper.listCompanyAndOrg(pg, companyName, companyCode, certifiedStatus, companyStatus, orgName, miniAppName);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.eContract.service.impl;
+
+import com.huiju.estateagents.eContract.entity.TaCompanySeal;
+import com.huiju.estateagents.eContract.mapper.TaCompanySealMapper;
+import com.huiju.estateagents.eContract.service.ITaCompanySealService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 公司印章  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Service
+public class TaCompanySealServiceImpl extends ServiceImpl<TaCompanySealMapper, TaCompanySeal> implements ITaCompanySealService {
+
+}

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

@@ -0,0 +1,160 @@
+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.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class TaCompanySealUtil {
+
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    public String addSignaTure(String customerId, String imgUrl) throws Exception {
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), fadadaProperties.getServeHost());
+        String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
+        return base.invokeaddSignature(customerId, base64Url);
+    }
+
+    public String replaceSignature(String customerId, String signatureId, String imgUrl){
+        String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + signatureId + base64Url));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("customer_id", customerId));
+            params.add(new BasicNameValuePair("signature_img_base64", base64Url));
+            params.add(new BasicNameValuePair("app_id", fadadaProperties.getAppId()));
+            params.add(new BasicNameValuePair("signature_id", signatureId));
+            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(fadadaProperties.getServeHost() + "replace_signature.api", params);
+    }
+
+    public String delSignature(String customerId, String signatureId){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + signatureId));
+            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("signature_id", signatureId));
+            params.add(new BasicNameValuePair("msg_digest", msgDigest));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getServeHost() + "remove_signature.api", params);
+    }
+
+    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId) 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(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="+ URLEncoder.encode(fadadaProperties.getAuthReturnUrl(), "UTF-8") + companyId);
+
+        return stringBuilder.toString();
+    }
+
+    public String getAuthStatus(String customerId){
+        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(fadadaProperties.getAuthServeHost() + "get_auth_status.api", params);
+    }
+
+    public String setDefaultSeal(String signatureId, String customerId){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + signatureId));
+            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));
+            params.add(new BasicNameValuePair("signature_id", signatureId));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "default_signature.api", params);
+    }
+
+    public String sendFddSms(String sourceUrl, String mobile){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String messageContent = "[${platform}]因小程序不支持人脸识别认证，请点击下面的链接开始人脸识别认证，认证通过后请回到小程序重新开始签署合同！${shortUrl}";
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + "10080" + messageContent + "2" + mobile + "2" + sourceUrl));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("source_url", sourceUrl));
+            params.add(new BasicNameValuePair("expire_time", "10080"));
+            params.add(new BasicNameValuePair("mobile", mobile));
+            params.add(new BasicNameValuePair("message_type", "2"));
+            params.add(new BasicNameValuePair("message_content", messageContent));
+            params.add(new BasicNameValuePair("sms_template_type", "2"));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "push_short_url_sms.api", params);
+    }
+}

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

@@ -0,0 +1,294 @@
+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.baomidou.mybatisplus.core.metadata.IPage;
+import com.fadada.sdk.client.FddClientBase;
+import com.fadada.sdk.client.authForfadada.FindCertInfo;
+import com.fadada.sdk.client.authForfadada.GetCompanyVerifyUrl;
+import com.fadada.sdk.client.authForfadada.model.AgentInfoINO;
+import com.fadada.sdk.client.authForfadada.model.BankInfoINO;
+import com.fadada.sdk.client.authForfadada.model.CompanyInfoINO;
+import com.fadada.sdk.client.authForfadada.model.LegalInfoINO;
+import com.fadada.sdk.util.http.HttpsUtil;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.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;
+
+/**
+ * <p>
+ * 企业认证表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Slf4j
+@Service
+public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany> implements ITaCompanyService {
+
+    @Autowired
+    private FadadaProperties fadadaProperties;
+
+    @Autowired
+    private TaCompanyMapper taCompanyMapper;
+
+    @Autowired
+    private TaContractMapper taContractMapper;
+
+    @Autowired
+    private TaCompanySealUtil taCompanySealUtil;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    /**
+     * 在法大大创建一个新的企业信息
+     *
+     * @return
+     */
+    @Override
+    public TaCompany newFirstCompanyInfo() throws Exception {
+        log.info("========法大大企业注册=======");
+        //在法大大注册企业用户
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String open_id = "CJ_" + HttpsUtil.getTimeStamp();
+        String account_type = CommConstant.ACCOUNT_TYPE_COMPANY;
+        String result =base.invokeregisterAccount(open_id,account_type);
+        log.info("法大大注册信息{}", result);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (jsonObject.getInteger("code") != 1){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+
+        //插入企业数据表
+        TaCompany taCompany = new TaCompany();
+        taCompany.setCompanyCode(open_id);
+        taCompany.setFadadaCode(jsonObject.getString("data"));
+        taCompany.setCertifiedStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
+        taCompany.setCreateDate(LocalDateTime.now());
+        taCompany.setStatus(CommConstant.STATUS_UNACCALIMED);
+        taCompanyMapper.insert(taCompany);
+        return taCompany;
+    }
+
+    /**
+     * 向法大大申请企业认证
+     *
+     * @param taCompany
+     * @return
+     */
+    @Override
+    public TaCompany updateCompanyInfo(TaCompany taCompany) throws Exception {
+        String companyPrincipalType = "1";
+        //法人
+        if (taCompany.getCompanyManagerType().equals(CommConstant.COMPANY_MANAGER_TYPE_LEGAL)){
+            companyPrincipalType = CommConstant.COMPANY_PRINCIPAL_TYPE_LEGAL;
+        }else if (taCompany.getCompanyManagerType().equals(CommConstant.COMPANY_MANAGER_TYPE_AGENT)){
+            companyPrincipalType = CommConstant.COMPANY_PRINCIPAL_TYPE_AGENT;
+        }
+        log.info("正在申请企业认证,客户编码是{}",taCompany.getFadadaCode());
+        //和法大大申请认证页面
+        GetCompanyVerifyUrl comverify = new GetCompanyVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        //客户编号必填
+        String customer_id = taCompany.getFadadaCode();
+        /**
+         * 实名认证套餐类型
+         * 0：标准方案（对公打款+纸质审核）默认0；
+         * 1：对公打款；
+         * 2：纸质审核',
+         */
+        String verifyed_way = "0";
+        //是否允许客户页面修改1允许
+        String page_modify = "1";
+        String m_verified_way = "1";
+        //跳转指定页面
+        String resultType = "1";
+        //自动申请证书
+        String certFlag = "1";
+
+        String notify_url = fadadaProperties.getCompanyNotify();
+        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);
+        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){
+            String url = JSON.parseObject(data).getString("url");
+            url = decode(url);
+            taCompany.setCertifiedAddress(url);
+            taCompany.setCertifiedSerialNumber(JSON.parseObject(data).getString("transactionNo"));
+        }
+        taCompany.setCertifiedStatus(CommConstant.CERTIFIED_STATUS_CERTIFICATION);
+        taCompanyMapper.updateById(taCompany);
+        return taCompany;
+    }
+
+    /**
+     * 向法大大获取最新的企业认证数据
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public TaCompany updateCompanyInfoByFdd(Integer id) throws Exception {
+        TaCompany taCompany = taCompanyMapper.selectById(id);
+        log.info("企业正在从法大大获取最新数据，企业编号是 {}", taCompany.getFadadaCode());
+        FindCertInfo personCertInfo = new FindCertInfo(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String verified_serialno = taCompany.getCertifiedSerialNumber();
+        String result = personCertInfo.invokeFindPersonCert(verified_serialno, CommConstant.ACCOUNT_TYPE_COMPANY);
+        log.info("企业最新数据结果 {}",result);
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (jsonObject.getInteger("code") != 1){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+        //更新数据
+        String data = jsonObject.getString("data");
+        if (null !=data){
+            JSONObject dataJson = JSONObject.parseObject(data);
+            //账户信息
+            JSONObject companyJson = dataJson.getJSONObject("company");
+            if (null != companyJson){
+                taCompany.setCompanyName(companyJson.getString("companyName"));
+                taCompany.setCertifiedType(companyJson.getInteger("verifyType"));
+                taCompany.setCreditCode(companyJson.getString("organization"));
+                taCompany.setStatus(companyJson.getInteger("status"));
+                taCompany.setReason(companyJson.getString("auditFailReason"));
+                taCompany.setVerifyTime(null);
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                String auditorTime = companyJson.getString("auditorTime");
+                if (!StringUtils.isEmpty(auditorTime)){
+                    int index = auditorTime.lastIndexOf(".");
+                    String substringTime = auditorTime.substring(0, index);
+                    taCompany.setVerifyTime(LocalDateTime.parse(substringTime,df));
+                }
+
+            }
+
+            //银行卡信息
+            JSONObject bankJson = dataJson.getJSONObject("bankCard");
+            if (null != bankJson){
+                taCompany.setBankName(bankJson.getString("bankName"));
+                taCompany.setSubbranchName(bankJson.getString("bankDetailName"));
+                taCompany.setBankAccount(bankJson.getString("bankCardNo"));
+            }
+
+            //企业法人、代理人信息
+            JSONObject managerJson = dataJson.getJSONObject("manager");
+            if (null != managerJson){
+                //0：个人； 1：法人； 2：代理人,
+                if (managerJson.getString("type").equals("1")){
+                    taCompany.setCompanyManagerType("legal");
+                }else if (managerJson.getString("type").equals("2")){
+                    taCompany.setCompanyManagerType("agent");
+                }
+                taCompany.setUserName(managerJson.getString("personName"));
+                taCompany.setTel(managerJson.getString("mobile"));
+                taCompany.setIdCard(managerJson.getString("idCard"));
+            }
+        }
+        taCompanyMapper.updateById(taCompany);
+        return taCompany;
+    }
+
+    @Override
+    public String autoAuthCompanySeal(Integer companyId, Integer orgId) throws Exception {
+        QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
+        taContractQueryWrapper.eq("target_type", CommConstant.AUTH);
+        taContractQueryWrapper.eq("company_id", companyId);
+        taContractQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TaContract taContract = taContractMapper.selectOne(taContractQueryWrapper);
+
+        TaCompany taCompany = taCompanyMapper.selectById(companyId);
+        String timeStamp = HttpsUtil.getTimeStamp();
+        String transactionId = "TRAN" + timeStamp;
+        if (taContract == null){
+            taContract = new TaContract();
+            taContract.setCompanyId(companyId);
+            taContract.setOrgId(orgId);
+            taContract.setCreateDate(LocalDateTime.now());
+            taContract.setTargetType(CommConstant.AUTH);
+            taContract.setSignatoryName(taCompany.getCompanyName());
+            taContract.setCustomerName("法大大公司平台");
+            taContract.setSignatoryTime(LocalDateTime.now());
+            taContract.setCustomerTime(LocalDateTime.now());
+            taContract.setStatus(CommConstant.STATUS_UNACCALIMED);
+            taContract.setOrgId(orgId);
+            taContractMapper.insert(taContract);
+        }else{
+            taContract.setSignatoryTime(LocalDateTime.now());
+            taContract.setCustomerTime(LocalDateTime.now());
+            taContractMapper.updateById(taContract);
+        }
+
+        Integer contractId = taContract.getContractId();
+        String customerId = taCompany.getFadadaCode();
+        String res = taCompanySealUtil.autoAuthCompanySeal(transactionId, CommConstant.AUTH_TYPE, String.valueOf(contractId), customerId, String.valueOf(companyId));
+        return res;
+    }
+
+    @Override
+    public TaCompany getCompanyAndContractInfo(Integer companyId) {
+        return taCompanyMapper.getCompanyAndContractInfo(companyId);
+    }
+
+    @Override
+    public String getAuthStatus(Integer companyId) {
+        TaCompany taCompany = taCompanyMapper.selectById(companyId);
+        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode());
+    }
+
+    @Override
+    public IPage<TaCompany> selectListByOrgId(IPage<TaCompany> iPage, String companyName, String companyCode, Integer orgId) {
+        return taCompanyMapper.selectListByOrgId(iPage, companyName, companyCode, orgId);
+    }
+
+    /**
+     * url解码
+     * @param bizContent
+     * @return
+     */
+    private String decode(String bizContent) {
+        bizContent = URLDecoder.decode(bizContent, "utf-8");
+        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("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.eContract.service.impl;
+
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.huiju.estateagents.eContract.mapper.TaContractBusinessMapper;
+import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 合同与业务关系表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Service
+public class TaContractBusinessServiceImpl extends ServiceImpl<TaContractBusinessMapper, TaContractBusiness> implements ITaContractBusinessService {
+
+}

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

@@ -0,0 +1,305 @@
+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.authForfadada.FindCertInfo;
+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.common.MD5Utils;
+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;
+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.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;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.File;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * <p>
+ * 合同列表  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Service
+@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;
+
+    @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) {
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaContract> pg = new Page<>(pageNum, pageSize);
+        pg = taContractMapper.listContractForAdmin(pg, contractName, archives, signatoryName, signatoryStatus, customerName, customerStatus, archivesStartDate, archivesEndDate, orgId);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
+        log.info("TaContractServiceImpl.listContractForChannel 接收参数:{}", JSONObject.toJSONString(requestBO));
+
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaContract> pg = new Page<>(requestBO.getPageNum(), requestBO.getPageSize());
+        pg = taContractMapper.listContractForChannel(pg, requestBO);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    /**
+     * 企业自动签署合同
+     *
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    @Override
+    @Transactional
+    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){
+            oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
+            oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
+            return oldContract;
+        }
+
+        //先入合同表
+        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());
+        taContract.setStatus(0);
+        taContract.setPersonId(person.getPersonId());
+        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");
+        JSONObject jsonObject = JSONObject.parseObject(result);
+        if (!jsonObject.getString("code").equals("1000")){
+            taContractMapper.deleteById(taContract.getContractId());
+            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.getString("code").equals("1000")){
+            throw new Exception(jsonObject.getString("msg"));
+        }
+
+        //反更新合同地址
+        taContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
+        taContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
+        taContract.setContractName(taContractBusiness.getContractTemplateName());
+        //合同详情
+        taContract.setCompanyName(taContractBusiness.getCompanyName());
+        taContract.setSignatoryName(taContractBusiness.getCompanyName());
+        taContract.setSignatoryTime(LocalDateTime.now());
+        taContract.setArchives(false);
+        taContractMapper.updateById(taContract);
+        return taContract;
+    }
+
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddDownServerHost(String miniappId,String subUrl) {
+        if (StringUtils.isEmpty(subUrl)){
+            return subUrl;
+        }
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddDownloadHost()) ? subUrl : taMiniapp.getFddDownloadHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+
+    /**
+     * 手动签署合同
+     *
+     * @param taContract
+     * @param person
+     * @return
+     */
+    @Override
+    public String manualContract(TaContract taContract, TaPerson person) throws Exception {
+        //获取客户信息
+        QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mini_openid", MD5Utils.md5(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){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
+
+        //手动签署合同
+        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());
+        String redirectUrl = URLEncoder.encode(URLEncoder.encode(
+                "/onlineSelling/pages/raiseMoney/signResult?id=" + taContract.getInvoiceTargetId(), "utf-8"), "utf-8");
+        String return_url=  fadadaProperties.getRedirectUrl() + "?appid=123&redirect="+ redirectUrl;
+        req.setReturn_url(URLEncoder.encode(return_url, "utf-8"));
+        req.setNotify_url(fadadaProperties.getSignNotify());
+        String signUrl = base.invokeExtSignDIY(req,"1","0");
+
+        //更新乙方数据
+        //获取个人信息
+        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){
+                taContract.setCustomerName(personJson.getString("personName"));
+                taContract.setCustomerTel(personJson.getString("mobile"));
+                taContract.setCustomerIdcard(personJson.getString("idCard"));
+            }
+        }
+
+        taContractMapper.updateById(taContract);
+        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);
+        oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
+        oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
+        return oldContract;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.eContract.service.impl;
+
+import com.huiju.estateagents.eContract.entity.TaContractTemplate;
+import com.huiju.estateagents.eContract.mapper.TaContractTemplateMapper;
+import com.huiju.estateagents.eContract.service.ITaContractTemplateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 合同模板  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-26
+ */
+@Service
+public class TaContractTemplateServiceImpl extends ServiceImpl<TaContractTemplateMapper, TaContractTemplate> implements ITaContractTemplateService {
+
+}

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

@@ -0,0 +1,177 @@
+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.common.MD5Utils;
+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.net.URLEncoder;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子合同注册用户表  服务实现类
+ * </p>
+ *
+ * @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;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+    /**
+     * 小程序端首次签署合同的是要在法大大处创建账号
+     *
+     * @param person
+     * @param taRaiseRecord
+     * @return
+     */
+    @Override
+    public TaContractUser newFirstCustomerInfo(TaPerson person, TaRaiseRecord taRaiseRecord) throws Exception {
+        //首先判断是否注册过账号
+        QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mini_openid",MD5Utils.md5(person.getMiniOpenid()));
+        TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
+        if (null != taContractUser) {
+            taContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+            taContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),taContractUser.getCertifiedAddress()));
+            return taContractUser;
+        }
+        //没有法大大账号的先注册
+        log.info("========法大大个人注册=======");
+        //在法大大注册个人用户
+        FddClientBase base = new FddClientBase(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        //小程序open——id为注册账号
+        String open_id = MD5Utils.md5(person.getMiniOpenid());
+        //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());
+
+        log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
+        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        String customer_id = jsonObject.getString("data");
+        //0:三要素标准方案； 1:三要素补充方案 4 纯三要素方案；
+        String verifyed_way = "4";
+        String page_modify = "1";
+        String notify_url = fadadaProperties.getCompanyNotify();
+        String redirectUrl = URLEncoder.encode("/onlineSelling/pages/raiseMoney/Certification", "utf-8");
+        String return_url=  fadadaProperties.getRedirectUrl() + "?appid=123&redirect="+ redirectUrl;
+        String customer_ident_type = "0";
+        String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
+                page_modify,notify_url,return_url,null,customer_ident_type,
+                taRaiseRecord.getIdcard(),taRaiseRecord.getTel(),null,"1","1");
+
+        String data = JSON.parseObject(personResult).getString("data");
+        if (null !=data){
+            String url = JSON.parseObject(data).getString("url");
+            url = decode(url);
+            newContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),url));
+            newContractUser.setCertifiedSerialNumber(JSON.parseObject(data).getString("transactionNo"));
+        }
+        newContractUser.setStatus(0);
+        newContractUser.setAuthStatus(CommConstant.CERTIFIED_STATUS_CERTIFICATION);
+        newContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+        taContractUserMapper.insert(newContractUser);
+        return newContractUser;
+    }
+
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+
+    /**
+     * 去法大大处更新客户的状态
+     *
+     * @param person
+     * @return
+     */
+    @Override
+    public TaContractUser getFirstCustomerInfo(TaPerson person) throws Exception {
+        //注册账号信息
+        QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mini_openid",MD5Utils.md5(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/java/com/huiju/estateagents/entity/TaMiniapp.java

@@ -59,6 +59,16 @@ public class TaMiniapp implements Serializable {
 
     private String aesKey;
 
+    /**
+     * 法大大服务地址
+     */
+    private String fddServerHost;
+
+    /**
+     * 法大大下载地址
+     */
+    private String fddDownloadHost;
+
     @TableField(exist = false)
     private List<TaMiniappTemplate> tpls;
 }

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

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 公司表 
+ * 公司表
  * </p>
  *
  * @author jobob
@@ -57,7 +57,7 @@ public class TaOrg implements Serializable {
      */
     private LocalDateTime createDate;
 
-    @TableField(strategy= FieldStrategy.IGNORED)
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String waterMark;
 
     /**
@@ -69,4 +69,16 @@ public class TaOrg implements Serializable {
      * 默认城市
      */
     private Integer defaultCityId;
+
+    /**
+     * 小程序名称
+     */
+    @TableField(exist = false)
+    private String miniAppName;
+
+    /**
+     * 代理商名称
+     */
+    @TableField(exist = false)
+    private String channelProxyName;
 }

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

@@ -166,4 +166,15 @@ public class TaRaise implements Serializable {
      */
     @TableField(exist = false)
     private Integer salesBatchStatus;
+
+    /**
+     * 是否邀请制 1是 0否
+     */
+    private Integer invite;
+
+    /**
+     * 被邀请电话号码
+     */
+    @TableField(exist = false)
+    private String inviteTel;
 }

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

@@ -0,0 +1,60 @@
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 认筹被邀请清单 
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRaiseInvite implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 认筹被邀请id
+     */
+    private String raiseInviteId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 认筹id
+     */
+    private Integer raiseId;
+
+    /**
+     * 销售批次id
+     */
+    private Integer salesBatchId;
+
+    /**
+     * 项目id
+     */
+    private String buildingId;
+
+    /**
+     * 被邀请电话号码
+     */
+    private String inviteTel;
+
+
+}

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

@@ -251,4 +251,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private Integer refundedOrderId;
+
+    /**
+     * 是否展示签署合同 1是 0否
+     */
+    @TableField(exist = false)
+    private Integer showContract;
 }

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -72,6 +72,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/admin/taPersonFromRecord",
             "/api/notify",//微信支付所有回调放过
             "/api/refund/",//微信退款所有回调放过
+            "/api/fadd/",//所有的法大大回调放过
     };
 
     /*

src/main/java/com/huiju/estateagents/mapper/TaOrgMapper.java

@@ -1,8 +1,11 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaOrg;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -13,6 +16,10 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2019-09-11
  */
 @Mapper
+@Component
 public interface TaOrgMapper extends BaseMapper<TaOrg> {
 
+    IPage<TaOrg> listOrgForContract(IPage<TaOrg> pg,
+                                    @Param("orgName") String orgName,
+                                    @Param("miniAppName") String miniAppName);
 }

src/main/java/com/huiju/estateagents/mapper/TaRaiseInviteMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 认筹被邀请清单  Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@Mapper
+public interface TaRaiseInviteMapper extends BaseMapper<TaRaiseInvite> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDateTime;
@@ -46,7 +47,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param id
      * @return
      */
-    ResponseBean buildingAllSelectId(String id,String personId, Integer orgId);
+    ResponseBean buildingAllSelectId(String id, TaPerson person, Integer orgId);
 
 
     /**

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -57,7 +57,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param houseId  房源ID
      * @return
      */
-    TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId);
+    TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId) throws Exception;
 
     /**
      * 校验楼栋信息存不存在

src/main/java/com/huiju/estateagents/service/ITaOrgService.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaOrg;
 
 /**
@@ -13,4 +14,14 @@ import com.huiju.estateagents.entity.TaOrg;
  */
 public interface ITaOrgService extends IService<TaOrg> {
 
+    /**
+     * channel端-电子合同-获取组织列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgName
+     * @param miniAppName
+     * @return
+     */
+    ResponseBean listOrgForContract(Integer pageNum, Integer pageSize, String orgName, String miniAppName);
 }

src/main/java/com/huiju/estateagents/service/ITaRaiseInviteService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 认筹被邀请清单  服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+public interface ITaRaiseInviteService extends IService<TaRaiseInvite> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaRaiseRecordService.java

@@ -101,5 +101,13 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
      * @param houseLockingStatus
      * @return
      */
-    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus,String personId);
+    Boolean updateHouseLockingStatus(Integer raiseRecordId, String houseLockingStatus, String personId);
+
+    /**
+     * 获取认筹单详情-微信端
+     *
+     * @param raiseRecordId
+     * @return
+     */
+    ResponseBean wxGetRaiseRecordById(Integer raiseRecordId, String personId,Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaRaiseService.java

@@ -5,7 +5,6 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -49,11 +48,20 @@ public interface ITaRaiseService extends IService<TaRaise> {
     ResponseBean getRaiseById(Integer id, Integer orgId);
 
     /**
-     *
      * @param raiseId
      * @param raiseRecordId
      * @param salesBatchId
      * @return
      */
     TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId);
+
+    /**
+     * 新增或添加被邀请人表
+     *
+     * @param taRaise
+     * @param orgId
+     * @param isAdd   是否新增 1是 0否，为新增则直接保存 不用校验是否已经添加过该邀请手机号
+     * @return
+     */
+    Boolean saveOrUpdateInvite(TaRaise taRaise, Integer orgId, Boolean isAdd);
 }

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

@@ -548,4 +548,47 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
         return taMiniappMapper.selectOne(queryWrapper);
     }
+
+    public void sendContractMessage(TaPerson toUser, String link, String name, String result, String programName,
+                                    String failReason, String remark, LocalDateTime dt, Boolean isSuccess) {
+
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return;
+        }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_HOUSE;
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
+        // 消息发送类型
+        String messageType = null == tpl ? CommConstant.MESSAGE_TYPE_OF_SMS :
+                isSubscribe ? CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE : CommConstant.MESSAGE_TYPE_OF_MINIAPP_TEMPLATE;
+
+        String[] smsParams = {programName, "电子合同待签署"};
+
+        if (null == tpl) {
+            if (isSuccess) {
+                log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
+                // 短信发送
+                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), "contract", smsParams);
+            }
+        } else {
+            if (isSubscribe) {
+                String[] data = new String[]{name, result, programName, remark, failReason, DateUtils.cutSecond(dt)};
+                ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+                if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                    // 使用短信发送
+                    sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), "contract", smsParams);
+                    messageType = CommConstant.MESSAGE_TYPE_OF_SMS;
+                }
+            } else {
+                log.info("发送模板消息");
+            }
+        }
+        // TODO 写消息发送日志
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, "contract", toUser.getOrgId());
+    }
 }

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

@@ -117,6 +117,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaPersonBuildingMapper taPersonBuildingMapper;
 
+    @Autowired
+    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<>();
@@ -221,7 +230,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id, String personId, Integer orgId) {
+    public ResponseBean buildingAllSelectId(String id, TaPerson person, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
@@ -271,7 +280,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         getBuildingAttaches(building);
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
         saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_PROJECT);
-        saveQueryWrapper.eq("person_id", personId);
+        saveQueryWrapper.eq("person_id", person.getPersonId());
         saveQueryWrapper.eq("saved_target", building.getBuildingId());
         Integer num = taSaveMapper.selectCount(saveQueryWrapper);
         if (num > 0) {
@@ -308,7 +317,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
         building.setShareActivityList(shareActivityList);
 
-        // TODO 直播活动
+        // 直播活动
         QueryWrapper<TaLiveActivity> liveActivityQueryWrapper = new QueryWrapper<>();
         liveActivityQueryWrapper.eq("building_id", id);
         liveActivityQueryWrapper.eq("status", 1);
@@ -336,8 +345,40 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getBuildingId, id);
         salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getStatus, CommConstant.STATUS_NORMAL);
         List<TaSalesBatch> taSalesBatch = iTaSalesBatchService.list(salesBatchQueryWrapper);
-        building.setSalesBatch(taSalesBatch);
 
+        List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
+        taSalesBatch.stream().forEach(record -> {
+            // 查询批次下认筹是否开启邀请制
+            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;
+            }
+
+            // 未开启邀请制
+            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.getPhone());
+                taRaiseInviteQueryWrapper.eq("sales_batch_id", record.getSalesBatchId());
+                TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+                if (taRaiseInvite != null) {
+                    resultSalesBatchList.add(record);
+                }
+            }
+        });
+
+        building.setSalesBatch(resultSalesBatchList);
         return ResponseBean.success(building);
     }
 

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

@@ -14,6 +14,7 @@ import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.BuildingImgPO;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import com.huiju.estateagents.service.ITaRaiseInviteService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -102,6 +103,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     private TaUserServiceImpl taUserService;
 
+    @Autowired
+    private ITaRaiseInviteService iTaRaiseInviteService;
+
     /**
      * 分页获取房源列表
      *
@@ -197,7 +201,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      * @return
      */
     @Override
-    public TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId) {
+    public TaHousingResourcesPO getHousingDetailById(String personId, Integer houseId) throws Exception {
         logger.info("getHousingDetailById 接收参数：personId：{}，houseId：{}", personId, houseId);
 
         // 查询房源详情
@@ -287,6 +291,20 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             resourcesPO.setTaRaise(taRaise);
         }
 
+        // 查询批次下认筹是否开启邀请制
+        TaPerson person = taPersonService.getById(personId);
+        if (null != taRaise && CommConstant.STATUS_NORMAL == taRaise.getInvite()) {
+            // 若开启邀请制，校验该用户是否在邀请列表中
+            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+            taRaiseInviteQueryWrapper.eq("org_id", orgId);
+            taRaiseInviteQueryWrapper.eq("invite_tel", person.getPhone());
+            taRaiseInviteQueryWrapper.eq("sales_batch_id", salesBatchId);
+            TaRaiseInvite taRaiseInvite = iTaRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+            if (null == taRaiseInvite) {
+                throw new Exception("仅限被邀请用户查看房源");
+            }
+        }
+
         return resourcesPO;
     }
 

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

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaOrg;
 import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.service.ITaOrgService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +21,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaOrgServiceImpl extends ServiceImpl<TaOrgMapper, TaOrg> implements ITaOrgService {
 
+    @Autowired
+    private TaOrgMapper taOrgMapper;
+
+    @Override
+    public ResponseBean listOrgForContract(Integer pageNum, Integer pageSize, String orgName, String miniAppName) {
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<TaOrg> pg = new Page<>(pageNum, pageSize);
+        pg = taOrgMapper.listOrgForContract(pg,orgName,miniAppName);
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
 }

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

@@ -113,12 +113,15 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             housingQueryWrapper.ne("status", -1);
             TaHousingResources housingResources = taHousingResourcesService.getOne(housingQueryWrapper);
             //户型图name
-            TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(housingResources.getApartmentId());
-            if (null != buildingApartment){
-                housingResources.setApartmentName(buildingApartment.getApartmentName());
-                housingResources.setBuildingArea(buildingApartment.getBuildingArea());
-                housingResources.setInsideArea(buildingApartment.getInsideArea());
+            if (null != housingResources){
+                TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(housingResources.getApartmentId());
+                if (null != buildingApartment){
+                    housingResources.setApartmentName(buildingApartment.getApartmentName());
+                    housingResources.setBuildingArea(buildingApartment.getBuildingArea());
+                    housingResources.setInsideArea(buildingApartment.getInsideArea());
+                }
             }
+
             record.setHousingInfo(housingResources);
         });
 

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.TaRaiseInvite;
+import com.huiju.estateagents.mapper.TaRaiseInviteMapper;
+import com.huiju.estateagents.service.ITaRaiseInviteService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 认筹被邀请清单  服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-03-30
+ */
+@Service
+public class TaRaiseInviteServiceImpl extends ServiceImpl<TaRaiseInviteMapper, TaRaiseInvite> implements ITaRaiseInviteService {
+
+}

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

@@ -13,11 +13,13 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
+import com.huiju.estateagents.eContract.entity.TaContract;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
+import com.huiju.estateagents.eContract.service.ITaContractService;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.po.TaHousingResourcesPO;
-import com.huiju.estateagents.service.ITaRaiseRecordService;
-import com.huiju.estateagents.service.ITaUvService;
+import com.huiju.estateagents.service.*;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -26,9 +28,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -76,6 +82,30 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     SMSUtils smsUtils;
 
+    @Autowired
+    private ITaRaiseService taRaiseService;
+
+    @Autowired
+    private ITaOrderService taOrderService;
+
+    @Autowired
+    private ITaBuildingImgService taBuildingImgService;
+
+    @Autowired
+    private ITaRaiseHouseService taRaiseHouseService;
+
+    @Autowired
+    private ITaHousingResourcesService taHousingResourcesService;
+
+    @Autowired
+    private ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    private ITaContractService iTaContractService;
+
+    @Autowired
+    private ITaContractBusinessService iTaContractBusinessService;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -305,6 +335,9 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
             String link = String.format(CommConstant.RAISE_DETAIL_PATH, raiseRecordId);
 
             miniAppService.sendCheckMessage(toUser, link, title, result, taBuilding.getBuildingName(), reason, remark, LocalDateTime.now(), isSuccess);
+            if(title.equals("电子合同")){
+                miniAppService.sendContractMessage(toUser, link, title, result, taBuilding.getBuildingName(), reason, remark, LocalDateTime.now(), isSuccess);
+            }
             logger.info("sendSubscribeMsg 结束");
         });
     }
@@ -320,4 +353,111 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         logger.info("TaRaiseRecordServiceImpl.updateHouseLockingStatus 接收参数:raiseRecordId:{},houseLockingStatus:{}", raiseRecordId, houseLockingStatus);
         return taHousingResourcesMapper.updateHouseLockingStatus(raiseRecordId, houseLockingStatus, personId);
     }
+
+    @Override
+    public ResponseBean wxGetRaiseRecordById(Integer raiseRecordId, String personId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //获取认筹单信息
+        TaRaiseRecord taRaiseRecord = getById(raiseRecordId);
+
+        //认筹表数据
+        TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
+        taRaise.setRaisePrice(taRaise.getRaisePrice());
+        //置业顾问信息
+        TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
+        if (null != consultantInfo) {
+            //职业顾问信息
+            TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
+            if (null != consultantPerson) {
+                consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
+            }
+        }
+
+        taRaiseRecord.setConsultantInfo(consultantInfo);
+        //房源与认筹单关系图
+        List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
+
+        //房源信息
+        List<TaHousingResources> houseList = (List<TaHousingResources>) taHousingResourcesService.listByIds(taRaiseHouseList.stream().map(TaRaiseHouse::getHouseId).collect(Collectors.toList()));
+
+        //我的认筹和锁定
+        houseList.forEach(e -> {
+            taRaiseHouseList.forEach(r -> {
+                //我的认筹
+                if (e.getHouseId().equals(r.getHouseId()) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
+                    e.setMineLocked("mine");
+                }
+            });
+
+            //塞入户型信息
+            if (!StringUtils.isEmpty(e.getApartmentId())) {
+                TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
+                e.setApartmentName(buildingApartment.getApartmentName());
+                e.setInsideArea(buildingApartment.getInsideArea());
+                e.setBuildingArea(buildingApartment.getBuildingArea());
+                //塞入户型图信息
+                List<String> apartMentIds = new ArrayList<>();
+                apartMentIds.add(e.getApartmentId());
+                List<TaBuildingImg> apartMentList = taBuildingImgService.getAparemnetList(apartMentIds);
+                e.setApartmentImgList(apartMentList);
+            }
+        });
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("refundOrder", null);
+        //订单信息
+        TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
+        if (null != taOrder) {
+            //退费信息
+            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
+            map.put("refundOrder", refundOrder);
+        }
+
+        // 是否展示签署合同入口
+        if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() && CommConstant.PAY_STATUS_PAID.equals(taRaiseRecord.getPayStatus())) {
+            // 是否有认筹业务合同配置
+            QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
+            taContractBusinessQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
+            taContractBusinessQueryWrapper.eq("org_id", orgId);
+            taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            TaContractBusiness taContractBusiness = iTaContractBusinessService.getOne(taContractBusinessQueryWrapper);
+            if (taContractBusiness != null) {
+                // 是否有有关联的认筹合同
+                QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
+                taContractQueryWrapper.eq("org_id", orgId);
+                taContractQueryWrapper.eq("target_type", "raise");
+                taContractQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
+                taContractQueryWrapper.eq("invoice_target_type", "raise_record");
+                taContractQueryWrapper.eq("invoice_target_id", taRaiseRecord.getRaiseRecordId());
+                taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
+                taContractQueryWrapper.eq("building_id", taRaiseRecord.getBuildingId());
+                taContractQueryWrapper.eq("person_id", personId);
+                TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
+                if (taContract != null) {
+                    // 合同状态正常
+                    if (CommConstant.STATUS_NORMAL == taContract.getStatus()) {
+                        taRaiseRecord.setShowContract(0);
+                        map.put("taContract", taContract);
+                    } else {
+                        taRaiseRecord.setShowContract(1);
+                    }
+                } else {
+                    taRaiseRecord.setShowContract(1);
+                }
+            } else {
+                taRaiseRecord.setShowContract(0);
+            }
+        } else {
+            taRaiseRecord.setShowContract(0);
+        }
+
+        map.put("taRaiseRecord", taRaiseRecord);
+        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

@@ -9,20 +9,22 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
-import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaRaiseHouseMapper;
 import com.huiju.estateagents.mapper.TaRaiseMapper;
 import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import com.huiju.estateagents.service.ITaRaiseInviteService;
 import com.huiju.estateagents.service.ITaRaiseService;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections4.QueueUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -51,6 +53,9 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
     @Autowired
     private ITaHousingResourcesService taHousingResourcesService;
 
+    @Autowired
+    private ITaRaiseInviteService taRaiseInviteService;
+
     @Override
     public ResponseBean listRaiseByCondition(Integer pageSize, Integer pageNum, String salesBatchName, String buildingId, Integer orgId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
         logger.info("listSalesBatchForRaise 接收参数：pageSize:{},pageNum:{},salesBatchName:{},buildilgId:{},orgId:{},status:{},taPersonBuildingListByUserId:{}",
@@ -109,6 +114,20 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             return responseBean;
         }
 
+        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;
@@ -160,4 +179,28 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
 
         return taRaise;
     }
+
+    @Override
+    public Boolean saveOrUpdateInvite(TaRaise taRaise, Integer orgId, Boolean isAdd) {
+        List<TaRaiseInvite> taRaiseInviteList = new ArrayList<>();
+        String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
+                new String[]{} : taRaise.getInviteTel().split("\n");
+
+        QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+        taRaiseInviteQueryWrapper.eq("org_id", orgId);
+        taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
+        taRaiseInviteService.remove(taRaiseInviteQueryWrapper);
+
+        Arrays.asList(inviteTelArr).stream().distinct().forEach(record -> {
+            TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
+            taRaiseInvite.setOrgId(orgId);
+            taRaiseInvite.setRaiseId(taRaise.getRaiseId());
+            taRaiseInvite.setBuildingId(taRaise.getBuildingId());
+            taRaiseInvite.setSalesBatchId(taRaise.getSalesBatchId());
+            taRaiseInvite.setCreateDate(LocalDateTime.now());
+            taRaiseInvite.setInviteTel(record);
+            taRaiseInviteList.add(taRaiseInvite);
+        });
+        return taRaiseInviteService.saveBatch(taRaiseInviteList);
+    }
 }

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

@@ -5,6 +5,8 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.common.wxpay.*;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
+import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
@@ -60,6 +62,9 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private ITaRaiseRecordService taRaiseRecordService;
 
+    @Autowired
+    private TaContractMapper taContractMapper;
+
     /**
      * 微信支付-统一下单
      *
@@ -295,7 +300,7 @@ public class WxPayServiceImpl implements IWxPayService {
         taRaiseRecord.setRefundReason(taOrder.getRefundReason());
         taRaiseRecordMapper.updateById(taRaiseRecord);
         //发送订阅消息
-        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"认筹通知","认筹正在退费","点击详情查看认筹单","正在等待微信或银行到账",false);
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"认筹通知","认筹正在退费","点击详情查看认筹单","正在等待微信或银行到账",false);
     }
 
     /**
@@ -353,7 +358,13 @@ public class WxPayServiceImpl implements IWxPayService {
         taRaiseRecordMapper.updateById(taRaiseRecord);
 
         //发送订阅消息
-        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getRaiseId(),"认筹通知","认筹支付成功","点击详情查看认筹单","已付款成功",false);
+        taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"认筹通知","认筹支付成功","点击详情查看认筹单","已付款成功",false);
+        //根据raiseId获取合同的所有参数
+        TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
+        if (null != taContractBusiness){
+            //发送订阅消息
+            taRaiseRecordService.sendRaiseMsg(taRaiseRecord.getRaiseRecordId(),taRaiseRecord.getPersonId(),"电子合同","待签署","点击签署认筹合同，若已签署请忽略",taContractBusiness.getContractTemplateName(),false);
+        }
     }
 
     /**

src/main/resources/application-blue.yml

@@ -74,6 +74,19 @@ sms:
     code: "0501"
 
 # 支付回调
-pay-notify: https://dev.pawoma.cn/api/notify/
+pay-notify: https://dev.fangdeal.cn/api/notify/
 #退款回调
-pay-refund: https://dev.pawoma.cn/api/refund/
+pay-refund: https://dev.fangdeal.cn/api/refund/
+
+#法大大服务器地址
+fadada:
+  appId: "403057"
+  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
+  version: "2.0"
+  authServeHost: "http://test.api.fabigbig.com:8888/api/"
+  serveHost: "https://testapi08.fadada.com/api/"
+  companyNotify: "https://dev.fangdeal.cn/api/fadd/company"
+  authReturnUrl: "https://dev.fangdeal.cn/channel/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
+  redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"

src/main/resources/application-dev.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8080
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"

src/main/resources/application-green.yml

@@ -74,6 +74,19 @@ sms:
     code: "0501"
 
 # 支付回调
-pay-notify: https://dev.pawoma.cn/api/notify/
+pay-notify: https://dev.fangdeal.cn/api/notify/
 #退款回调
-pay-refund: https://dev.pawoma.cn/api/refund/
+pay-refund: https://dev.fangdeal.cn/api/refund/
+
+#法大大服务器地址
+fadada:
+  appId: "403057"
+  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
+  version: "2.0"
+  authServeHost: "http://test.api.fabigbig.com:8888/api/"
+  serveHost: "https://testapi08.fadada.com/api/"
+  companyNotify: "https://dev.fangdeal.cn/api/fadd/company"
+  authReturnUrl: "https://dev.fangdeal.cn/channel/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
+  redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"

src/main/resources/application-gzysd.yml

@@ -1,129 +0,0 @@
-<<<<<<< HEAD
-server:
-  port: 8009
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_17?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxe3b1e683853800b5
-    secret: 207dd6d0f807b2dd0d41b57a8184365f
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
-      keywords: 6
-ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"
-=======
-server:
-  port: 8009
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_gzysd?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wxe3b1e683853800b5
-    secret: 207dd6d0f807b2dd0d41b57a8184365f
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: IVWM-wpzSNV6CyXeSBGBgRku2lRrZ-3x4vXRILQpHM0
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-
->>>>>>> ac499f2ddc4d4469098e59fff8bbe310779f7be3

src/main/resources/application-hj.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8011
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_hj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wx03aca9d7d9b0b7f1
-    secret: f85aa21010204969b0f9a16f81de8a4b
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: Dflyeuyy76tCpam6OfVMblBaiog9fBt4NGAxbLPQ6AI
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: BDrgtJK9zul0gtHhHwY31x7kDH8BWGJxKvkj1wPzB4E
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-

src/main/resources/application-jj.yml

@@ -1,52 +0,0 @@
-server:
-  port: 8013
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_jj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/*.xml
-wx:
-  miniapp:
-    appid: wx7183d7d918a426d3
-    secret: d06320d36d0b706f981da20b796c5875
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 80jdxzuPITEffVNC1KD1IGvbOxGkipTJlrxPosQrz0s
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: UbuzqEqULHf_NAZHay_3RJPGHm1g11YYU2R66ASq5Uw
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-

src/main/resources/application-nj.yml

@@ -1,75 +0,0 @@
-server:
-  port: 8007
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_nj?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wx1a3e5f7d0139285e
-    secret: 06d3db7f27ea08481effd509aa4dcb57
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: wO59V2ARIEXsoYaX1AlB9HK_SqUlnJzZq_X-xeYS1rU
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: wO59V2ARIEXsoYaX1AlB9HK_SqUlnJzZq_X-xeYS1rU
-
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/application-prod-blue.yml

@@ -79,6 +79,19 @@ logging:
   debug: true
 
 # 支付回调
-pay-notify: https://lt.pawoma.cn/api/notify/
+pay-notify: https://wx.fangdeal.cn/api/notify/
 #退款回调
-pay-refund: https://lt.pawoma.cn/api/refund/
+pay-refund: https://wx.fangdeal.cn/api/refund/
+
+#法大大服务器地址
+fadada:
+  appId: "500261"
+  appSecret: "go9yihmg7abS2lIBZpZ2yLSW"
+  version: "2.0"
+  authServeHost: "https://textapi.fadada.com/api2/"
+  serveHost: "https://textapi.fadada.com/api2/"
+  companyNotify: "https://wx.fangdeal.cn/api/fadd/company"
+  authReturnUrl: "http://admin.fangdeal.cn/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
+  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"

src/main/resources/application-prod-green.yml

@@ -79,6 +79,19 @@ logging:
   debug: true
 
 # 支付回调
-pay-notify: https://lt.pawoma.cn/api/notify/
+pay-notify: https://wx.fangdeal.cn/api/notify/
 #退款回调
-pay-refund: https://lt.pawoma.cn/api/refund/
+pay-refund: https://wx.fangdeal.cn/api/refund/
+
+#法大大服务器地址
+fadada:
+  appId: "500261"
+  appSecret: "go9yihmg7abS2lIBZpZ2yLSW"
+  version: "2.0"
+  authServeHost: "https://textapi.fadada.com/api2/"
+  serveHost: "https://textapi.fadada.com/api2/"
+  companyNotify: "https://wx.fangdeal.cn/api/fadd/company"
+  authReturnUrl: "http://admin.fangdeal.cn/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
+  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"

src/main/resources/application-rc.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8005
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_test?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxe9e01aa4a3568f52
-    secret: f1d70000e55f221976b95a43084042b0
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: FikibBOSwA_v0Ud80o9t_06kAUjn5TRd60
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: 8b0kuLCKzPeu1MUBfpLT9DhysqMl2LSWNYqluycvGm8
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/application-v3.yml

@@ -1,58 +0,0 @@
-server:
-  port: 8080
-spring:
-  application:
-    name: estateagents
-  datasource:
-   username: estateagents
-   password: DQ@0lW##kBb2+-jPZ
-   url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.0?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-   driver-class-name: com.mysql.cj.jdbc.Driver
-   initial-size: 10 # 初始化连接数
-   max-active: 20 # 最大连接数
-   min-idle: 8 # 最小空闲数
-   max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"

src/main/resources/application-xs.yml

@@ -1,74 +0,0 @@
-server:
-  port: 8003
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents2?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    initial-size: 10 # 初始化连接数
-    max-active: 20 # 最大连接数
-    min-idle: 8 # 最小空闲数
-    max-idle: 8 # 最大空闲数
-  servlet:
-    multipart:
-      max-file-size: 10MB
-      max-request-size: 50MB
-
-##mybatis-plus
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wx09cd665abf378db7
-    secret: a6cbd778272c87426952b5a1f8449698
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: thSzcSAhIHiZZuCdydBsoB-dSa_g72vHgqo9e_CltNM
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: iJLceA_zp1fq9xnL4yV8IOwWGeFHebCO-HxNtcPYLoA
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://micservice.ycjcjy.com/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: AI智慧案场
-
-  visitor:
-    code: "0501"

src/main/resources/mapper/TaOrgMapper.xml

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaOrgMapper">
 
+    <select id="listOrgForContract" resultType="com.huiju.estateagents.entity.TaOrg">
+        SELECT
+            *,
+            t2.`name` miniAppName,
+            t4.channel_proxy_name
+        FROM
+            ta_org t
+            LEFT JOIN ta_miniapp t2 ON t.org_id = t2.org_id
+            left join ta_channel_app_relation t3 on t.org_id =t3.org_id
+            left join ta_channel_proxy t4 on t3.channel_id = t4.channel_id
+        <where>
+            <if test = "orgName != null and orgName != ''">
+                t.`name` like concat('%',#{orgName},'%')
+            </if>
+            <if test = "miniAppName != null and miniAppName != ''">
+                AND t2.`name` like concat('%',#{miniAppName},'%')
+            </if>
+        </where>
+        ORDER BY
+            t.create_date DESC
+    </select>
+
 </mapper>

src/main/resources/mapper/TaRaiseInviteMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaRaiseInviteMapper">
+
+</mapper>

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>
+
+    <select id="selectListByOrgId" resultType="com.huiju.estateagents.eContract.entity.TaCompany">
+        select t.* From ta_company t
+        left join ta_company_org a on t.company_id = a.company_id
+        where a.org_id = #{orgId}
+        <if test="companyCode != null and companyCode!=''">
+            and t.company_code like CONCAT('%', #{companyCode}, '%')
+        </if>
+        <if test="companyName != null and companyName!=''">
+            and t.company_name like CONCAT('%', #{companyName}, '%')
+        </if>
+        and t.status = 4
+        order by t.create_date desc
+    </select>
+
+</mapper>

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.TaCompanyOrgMapper">
+
+    <select id="listCompanyAndOrg" resultType="com.huiju.estateagents.eContract.entity.TaCompanyOrg">
+        SELECT
+            t.*,
+            t2.company_name,
+            t2.company_code,
+            t2.certified_status,
+            t2.status companyStatus,
+            t3.`name` orgName,
+            t4.`name` miniAppName
+        FROM
+            ta_company_org t
+            LEFT JOIN ta_company t2 ON t.company_id = t2.company_id
+            LEFT JOIN ta_org t3 ON t.org_id = t3.org_id
+            LEFT JOIN ta_miniapp t4 ON t3.org_id = t4.org_id
+        WHERE
+            t2.`status` != -1
+            <if test = "companyName != null and companyName != ''">
+                AND t2.company_name like CONCAT('%',#{companyName} , '%')
+            </if>
+            <if test = "companyStatus != null ">
+                AND t2.`status` = #{companyStatus}
+            </if>
+            <if test = "companyCode != null and companyCode != ''">
+                AND t2.company_code like CONCAT('%',#{companyCode} , '%')
+            </if>
+            <if test = "certifiedStatus != null and certifiedStatus != ''">
+                AND t2.certified_status = #{certifiedStatus}
+            </if>
+            <if test = "orgName != null and orgName != ''">
+                AND t3.`name` like CONCAT('%',#{orgName} , '%')
+            </if>
+            <if test = "miniAppName != null and miniAppName != ''">
+                AND t4.`name` like CONCAT('%',#{miniAppName} , '%')
+            </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.TaCompanySealMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.TaContractBusinessMapper">
+
+</mapper>

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

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.TaContractMapper">
+
+    <select id="listContractForAdmin" resultType="com.huiju.estateagents.eContract.entity.TaContract">
+        SELECT
+            *
+        FROM
+            ta_contract t
+        where
+            t.org_id = #{orgId}
+            <if test="contractName != null and contractName != ''">
+                AND t.contract_name LIKE CONCAT( '%', #{contractName}, '%' )
+            </if>
+            <if test="signatoryName != null and signatoryName != ''">
+                AND t.signatory_name LIKE CONCAT( '%', #{signatoryName}, '%' )
+            </if>
+            <if test="customerName != null and customerName != ''">
+                AND t.customer_name LIKE CONCAT( '%', #{customerName}, '%' )
+            </if>
+            <if test="archives != null">
+                AND t.archives = #{archives}
+            </if>
+            <if test="archivesStartDate != null">
+                AND t.archives_time &gt;= #{archivesStartDate}
+            </if>
+            <if test="archivesEndDate != null">
+                AND t.archives_time &lt;= #{archivesEndDate}
+            </if>
+            <choose>
+                <when test="signatoryStatus == 0">
+                    AND t.signatory_time is NULL
+                </when>
+                <when test="signatoryStatus == 1">
+                    AND t.signatory_time is not NULL
+                </when>
+                <otherwise></otherwise>
+            </choose>
+            <choose>
+                <when test="customerStatus == 0">
+                    AND t.customer_time is NULL
+                </when>
+                <when test="customerStatus == 1">
+                    AND t.customer_time is not NULL
+                </when>
+                <otherwise></otherwise>
+            </choose>
+        ORDER BY
+        t.signatory_time DESC
+    </select>
+
+    <select id="listContractForChannel" resultType="com.huiju.estateagents.eContract.entity.TaContract">
+        SELECT
+            t.*,
+            t2.company_name,
+            t2.company_code,
+            t3.`name` orgName,
+            t4.`name` miniAppName,
+            t6.channel_proxy_name
+        FROM
+            ta_contract t
+            LEFT JOIN ta_company t2 ON t.company_id = t2.company_id
+            LEFT JOIN ta_org t3 ON t.org_id = t3.org_id
+            LEFT JOIN ta_miniapp t4 ON t.org_id = t4.org_id
+            LEFT JOIN ta_channel_app_relation t5 ON t.org_id = t5.org_id
+            LEFT JOIN ta_channel_proxy t6 ON t5.channel_id = t6.channel_id
+        <where>
+            t.target_type != 'auth'
+            <if test=" bo.companyName != null and bo.companyName != ''">
+                AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
+            </if>
+            <if test=" bo.settlement != null and bo.settlement ">
+                AND t.settlement = #{bo.settlement}
+            </if>
+            <if test=" bo.settlement != null and bo.settlement == false ">
+                AND (t.settlement = #{bo.settlement} or t.settlement is null)
+            </if>
+            <if test=" bo.companyCode != null and bo.companyCode != ''">
+                AND t2.company_code like CONCAT('%',#{bo.companyCode} , '%')
+            </if>
+            <if test=" bo.orgName != null and bo.orgName != ''">
+                AND t3.`name` like CONCAT('%',#{bo.orgName} , '%')
+            </if>
+            <if test=" bo.miniAppName != null and bo.miniAppName != ''">
+                AND t4.`name` like CONCAT('%',#{bo.miniAppName} , '%')
+            </if>
+            <if test=" bo.contractId != null">
+                AND t.contract_id like CONCAT('%',#{bo.contractId} , '%')
+            </if>
+            <if test=" bo.contractName != null and bo.contractName != ''">
+                AND t.contract_name like CONCAT('%',#{bo.contractName} , '%')
+            </if>
+            <if test=" bo.channelProxyName != null and bo.channelProxyName != ''">
+                AND t6.channel_proxy_name like CONCAT('%',#{bo.channelProxyName} , '%')
+            </if>
+            <if test=" bo.signatoryStartTime != null">
+                AND t.signatory_time &gt;= #{bo.signatoryStartTime}
+            </if>
+            <if test=" bo.signatoryEndTime != null ">
+                AND t.signatory_time &lt;= #{bo.signatoryEndTime}
+            </if>
+            <if test=" bo.settlementStartTime != null">
+                AND t.settlement_time &gt;= #{bo.settlementStartTime}
+            </if>
+            <if test=" bo.settlementEndTime != null">
+                AND t.settlement_time &lt;= #{bo.settlementEndTime}
+            </if>
+        </where>
+        ORDER BY
+            t.signatory_time DESC
+    </select>
+
+    <select id="selectContractInfoByRaiseId" resultType="com.huiju.estateagents.eContract.entity.TaContractBusiness">
+        SELECT
+            t.*,
+            c.contract_template_address,
+            s.signature_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}
+        AND t.`status` = 1
+    </select>
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.TaContractTemplateMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.TaContractUserMapper">
+
+</mapper>