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

# Conflicts:
#	src/main/java/com/huiju/estateagents/eContract/entity/TaContractBusiness.java

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

@@ -1,9 +1,9 @@
 package com.huiju.estateagents.bo.request;
 
 import lombok.Data;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 /**
  * 查询合同列表请求实体
@@ -64,20 +64,25 @@ public class ContractRecordRequestBO {
     /**
      * 甲方签署开始时间
      */
-    private LocalDateTime signatoryStartTime;
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryStartTime;
 
     /**
      * 甲方签署结束时间
      */
-    private LocalDateTime signatoryEndTime;
+
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate signatoryEndTime;
 
     /**
      * 结算开始时间
      */
-    private LocalDateTime settlementStartTime;
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementStartTime;
 
     /**
      * 结算结束时间
      */
-    private LocalDateTime settlementEndTime;
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
+    private LocalDate settlementEndTime;
 }

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,20 +141,38 @@ 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.getIsInvite()) {
+                    TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
+                    taRaiseInvite.setOrgId(orgId);
+                    taRaiseInvite.setRaiseId(taRaise.getRaiseId());
+                    taRaiseInvite.setBuildingId(taRaise.getBuildingId());
+                    taRaiseInvite.setSalesBatchId(taSalesBatch.getSalesBatchId());
+                    taRaiseInvite.setCreateDate(LocalDateTime.now());
+                    List<TaRaiseInvite> taRaiseInviteList = new ArrayList<>();
+                    String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
+                            new String[]{} : taRaise.getInviteTel().replace("，", ",").split(",");
+                    for (String inviteTel : inviteTelArr) {
+                        taRaiseInvite.setInviteTel(inviteTel);
+                        taRaiseInviteList.add(taRaiseInvite);
+                    }
+                    iTaRaiseInviteService.saveBatch(taRaiseInviteList);
+                }
+
                 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 {
@@ -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 {
@@ -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 {

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.eContract.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,6 +11,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.config.FadadaProperties;
+import com.huiju.estateagents.sample.entity.TaH5Demand;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +27,9 @@ import com.huiju.estateagents.eContract.entity.TaCompany;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -60,8 +64,8 @@ public class TaCompanyController extends BaseController {
      * @param certifiedStatus
      * @return
      */
-    @RequestMapping(value = "/channel/contract/lisCompany", method = RequestMethod.GET)
-    public ResponseBean lisCompany(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    @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();
@@ -78,8 +82,7 @@ public class TaCompanyController extends BaseController {
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         } catch (Exception e) {
-            e.printStackTrace();
-            logger.error("taCompanyList -=- {}", e.toString());
+            logger.error("listCompany -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -262,7 +265,7 @@ public class TaCompanyController extends BaseController {
      * @param pageSize
      * @param companyName
      * @param companyCode
-     * @param certifiedStatus
+     * @param status
      * @return
      */
     @RequestMapping(value = "/channel/company/list", method = RequestMethod.GET)
@@ -270,7 +273,7 @@ public class TaCompanyController extends BaseController {
                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "companyName", required = false) String companyName,
                                        @RequestParam(value = "companyCode", required = false) String companyCode,
-                                       @RequestParam(value = "certifiedStatus", required = false) String certifiedStatus) {
+                                       @RequestParam(value = "certifiedStatus", required = false) String status) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -278,8 +281,8 @@ public class TaCompanyController extends BaseController {
             QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
             queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
-            queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
-            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
@@ -346,4 +349,55 @@ public class TaCompanyController extends BaseController {
         }
         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_UNACCALIMED.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;
+    }
 }

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

@@ -1,18 +1,33 @@
 package com.huiju.estateagents.eContract.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.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>
  * 合同列表  前端控制器
@@ -28,56 +43,68 @@ public class TaContractController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(TaContractController.class);
 
     @Autowired
-    public ITaContractService iTaContractService;
+    private ITaContractService iTaContractService;
+
+    @Autowired
+    private ITaRaiseService iTaRaiseService;
+
+    @Autowired
+    private ITaSalesBatchService iTaSalesBatchService;
+
 
+    @Autowired
+    public ITaPersonService taPersonService;
 
     /**
-     * 条件查询合同列表
+     * 条件查询合同列表 -- admin端
      *
-     * @param requestBO
+     * @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 = "/channel/contract/list", method = RequestMethod.GET)
-    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
+    @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.listContractForChannel(requestBO);
-            logger.info("TaContractController.listContractForChannel 返回结果:{}", JSONObject.toJSONString(responseBean));
+            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.listContractForChannel 异常：", e);
+            logger.error("TaContractController.listContractForAdmin 异常：", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
+
     /**
-     * 批量结算前校验
+     * 条件查询合同列表 -- channel端
      *
+     * @param requestBO
      * @return
      */
-    @RequestMapping(value = "/channel/contract/checkBeforeBatchUpdatePrice", method = RequestMethod.GET)
-    public ResponseBean checkBeforeBatchUpdatePrice(@RequestBody TaContract taContract) {
+    @RequestMapping(value = "/channel/contract/list", method = RequestMethod.GET)
+    public ResponseBean listContractForChannel(ContractRecordRequestBO requestBO) {
         ResponseBean responseBean = new ResponseBean();
-        Integer fitNum = 0;
-        Integer notFitNum = 0;
-        Integer totalNum = taContract.getTaContractList().size();
         try {
-            for (TaContract record : taContract.getTaContractList()) {
-                TaContract contract = iTaContractService.getById(record.getContractId());
-                if (contract == null) {
-                    fitNum++;
-                } else {
-                    notFitNum++;
-                }
-            }
-
-            JSONObject obj = new JSONObject();
-            obj.put("fitNum", fitNum);
-            obj.put("notFitNum", notFitNum);
-            obj.put("totalNum", totalNum);
-            responseBean.addSuccess(obj);
+            responseBean = iTaContractService.listContractForChannel(requestBO);
+            logger.info("TaContractController.listContractForChannel 返回结果:{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
-            logger.error("TaContractController.checkBeforeBatchUpdatePrice 异常：", e);
+            logger.error("TaContractController.listContractForChannel 异常：", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -93,21 +120,23 @@ public class TaContractController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             // 校验参数
-            if (taContract.getSettlementPrice() == null) {
+            if (taContract.getPrice() == null) {
                 responseBean.addError("请填写结算金额");
                 return responseBean;
             }
 
             // 校验金额是否符合要求
-            if (!CommonUtils.isAmount(taContract.getSettlementPrice() + "")) {
+            if (!CommonUtils.isAmount(taContract.getPrice() + "")) {
                 responseBean.addError("结算金额不符合要求");
                 return responseBean;
             }
 
             // 元转分
-            Integer price = taContract.getSettlementPrice() * 100;
+            Double price = taContract.getPrice() * 100;
             taContract.getTaContractList().stream().forEach(record -> {
-                record.setSettlementPrice(price);
+                record.setSettlement(true);
+                record.setSettlementPrice(price.intValue());
+                record.setSettlementTime(LocalDateTime.now());
             });
             responseBean.addSuccess(iTaContractService.updateBatchById(taContract.getTaContractList()));
 
@@ -171,11 +200,14 @@ public class TaContractController extends BaseController {
      * @param taContract 实体对象
      * @return
      */
-    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.PUT)
+    @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)) {
                 responseBean.addSuccess(taContract);
             } else {
@@ -194,11 +226,21 @@ public class TaContractController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taContract/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/contract/{id}", method = RequestMethod.GET)
     public ResponseBean taContractGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaContractService.getById(id));
+            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());
@@ -206,4 +248,27 @@ public class TaContractController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 自动签署合同
+     */
+    @RequestMapping(value = "/wx/contract/auto", method = RequestMethod.POST)
+    public ResponseBean autoContract(@RequestBody TaRaiseRecord taRaiseRecord, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = getOpenId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            TaContract taContract = iTaContractService.autoContract(taRaiseRecord, person);
+            responseBean.addSuccess(taContract);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taCompanyList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -6,9 +6,10 @@ 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.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;
@@ -16,6 +17,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
     * 合同模板  前端控制器
@@ -36,6 +40,7 @@ public class TaContractTemplateController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
@@ -67,21 +72,46 @@ public class TaContractTemplateController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taContractTemplate 实体对象
      * @return
      */
-    @RequestMapping(value="/taContractTemplate",method= RequestMethod.POST)
-    public ResponseBean taContractTemplateAdd(@RequestBody TaContractTemplate taContractTemplate){
+    @RequestMapping(value = "/admin/contract/template/add", method = RequestMethod.POST)
+    public ResponseBean taContractTemplateAdd(@RequestBody TaContractTemplate taContractTemplate,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaContractTemplateService.save(taContractTemplate)){
+            taContractTemplate.setCreateDate(LocalDateTime.now());
+            taContractTemplate.setStatus(CommConstant.STATUS_NORMAL);
+            taContractTemplate.setOrgId(getOrgId(request));
+            if (iTaContractTemplateService.save(taContractTemplate)) {
                 responseBean.addSuccess(taContractTemplate);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContractTemplateAdd -=- {}",e.toString());
+            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;

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

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

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

@@ -78,7 +78,7 @@ public class TaCompany implements Serializable {
     /**
      * 认证方式 认证方式
      */
-    private String certifiedType;
+    private Integer certifiedType;
 
     /**
      * 创建时间

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

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

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

@@ -3,6 +3,7 @@ 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;
@@ -13,7 +14,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 合同列表 
+ * 合同列表
  * </p>
  *
  * @author fxf
@@ -35,13 +36,15 @@ public class TaContract implements Serializable {
     /**
      * 企业id
      */
-    private String companyId;
+    private Integer companyId;
 
     /**
      * 公司id
      */
     private Integer orgId;
-    /** 楼盘id */
+    /**
+     * 楼盘id
+     */
     private String buildingId;
 
     /**
@@ -139,8 +142,10 @@ public class TaContract implements Serializable {
      */
     private Integer settlementPrice;
 
-    /** 小程序用户id */
-    private String personId ;
+    /**
+     * 小程序用户id
+     */
+    private String personId;
 
     /**
      * 公司名
@@ -172,7 +177,16 @@ public class TaContract implements Serializable {
     @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

@@ -114,4 +114,9 @@ public class TaContractBusiness implements Serializable {
 
     @TableField(exist = false)
     private List<TaContractBusiness> contractBusinessList;
+
+    private String contractTemplateAddress;
+
+    @TableField(exist = false)
+    private String signatrueId;
 }

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

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.eContract.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -54,5 +57,6 @@ public class TaContractTemplate implements Serializable {
      */
     private Integer status;
 
-
+    @TableField(exist = false)
+    private List<TaContractTemplate> taContractTemplateList;
 }

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

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

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

@@ -4,8 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.bo.request.ContractRecordRequestBO;
 import com.huiju.estateagents.eContract.entity.TaContract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,8 +21,27 @@ import org.apache.ibatis.annotations.Param;
  * @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/service/ITaCompanyService.java

@@ -26,4 +26,11 @@ public interface ITaCompanyService extends IService<TaCompany> {
      * @return
      */
     TaCompany updateCompanyInfo(TaCompany taCompany) throws Exception;
+
+    /**
+     * 向法大大获取最新的企业认证数据
+     * @param id
+     * @return
+     */
+    TaCompany updateCompanyInfoByFdd(Integer id) throws Exception;
 }

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

@@ -4,7 +4,12 @@ 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;
 
 /**
@@ -17,6 +22,25 @@ import java.time.LocalDateTime;
  */
 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);
+
     /**
      * 条件查询合同列表
      *
@@ -24,4 +48,12 @@ public interface ITaContractService extends IService<TaContract> {
      * @return
      */
     ResponseBean listContractForChannel(ContractRecordRequestBO requestBO);
+
+    /**
+     * 企业自动签署合同
+     * @param taRaiseRecord
+     * @param person
+     * @return
+     */
+    TaContract autoContract(TaRaiseRecord taRaiseRecord, TaPerson person);
 }

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

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

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.eContract.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 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;
@@ -10,6 +11,7 @@ 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.eContract.entity.TaCompany;
 import com.huiju.estateagents.eContract.mapper.TaCompanyMapper;
@@ -66,7 +68,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         taCompany.setFadadaCode(jsonObject.getString("data"));
         taCompany.setCertifiedStatus(CommConstant.CERTIFIED_STATUS_REGISTERED);
         taCompany.setCreateDate(LocalDateTime.now());
-        taCompany.setStatus(CommConstant.STATUS_NORMAL);
+        taCompany.setStatus(CommConstant.STATUS_UNACCALIMED);
         taCompanyMapper.insert(taCompany);
         return taCompany;
     }
@@ -107,7 +109,6 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         String certFlag = "1";
 
         String notify_url = "http://www.baidu.com";//必填
-//        String return_url = "http://www.baidu.com";//可填
         String result = comverify.invokeCompanyVerifyUrl(new CompanyInfoINO(), new BankInfoINO(),new LegalInfoINO()
                 ,new AgentInfoINO(), customer_id,verifyed_way,m_verified_way,page_modify,
                 companyPrincipalType,null,notify_url,resultType,certFlag);
@@ -128,6 +129,59 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, 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(StringUtils.isEmpty(companyJson.getString("auditorTime")) ? null : LocalDateTime.parse(companyJson.getString("auditorTime")));
+            }
+
+            //银行卡信息
+            JSONObject bankJson = dataJson.getJSONObject("company");
+            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){
+                taCompany.setUserName(managerJson.getString("personName"));
+                taCompany.setTel(managerJson.getString("mobile"));
+                taCompany.setIdCard(managerJson.getString("idCard"));
+            }
+        }
+        taCompanyMapper.updateById(taCompany);
+        return taCompany;
+    }
+
     /**
      * url解码
      * @param bizContent

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

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

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

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

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

@@ -75,4 +75,10 @@ public class TaOrg implements Serializable {
      */
     @TableField(exist = false)
     private String miniAppName;
+
+    /**
+     * 代理商名称
+     */
+    @TableField(exist = false)
+    private String channelProxyName;
 }

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

@@ -166,4 +166,16 @@ public class TaRaise implements Serializable {
      */
     @TableField(exist = false)
     private Integer salesBatchStatus;
+
+    /**
+     * 是否邀请制 1是 0否
+     */
+    @TableField(exist = false)
+    private Integer isInvite;
+
+    /**
+     * 被邀请电话号码
+     */
+    @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/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/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/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/resources/mapper/TaOrgMapper.xml

@@ -5,16 +5,19 @@
     <select id="listOrgForContract" resultType="com.huiju.estateagents.entity.TaOrg">
         SELECT
             *,
-            t2.`name` miniAppName
+            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` = #{orgName}
+                t.`name` like concat('%',#{orgName},'%')
             </if>
             <if test = "miniAppName != null and miniAppName != ''">
-                AND t2.`name` = #{miniAppName}
+                AND t2.`name` like concat('%',#{miniAppName},'%')
             </if>
         </where>
         ORDER BY

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/TaCompanyOrgMapper.xml

@@ -6,7 +6,6 @@
         SELECT
             t.*,
             t2.company_name,
-            t2.company_id,
             t2.certified_status,
             t3.`name` orgName,
             t4.`name` miniAppName

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

@@ -2,11 +2,58 @@
 <!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 = NULL
+                </when>
+                <when test="signatoryStatus == 1">
+                    AND t.signatory_time &lt;&gt; NULL
+                </when>
+                <otherwise></otherwise>
+            </choose>
+            <choose>
+                <when test="signatoryStatus == 0">
+                    AND t.customer_time = NULL
+                </when>
+                <when test="signatoryStatus == 1">
+                    AND t.customer_time &lt;&gt; 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_number,
+            t2.company_code,
             t3.`name` orgName,
             t4.`name` miniAppName,
             t6.channel_proxy_name
@@ -42,20 +89,35 @@
             <if test=" bo.channelProxyName != null and bo.channelProxyName != ''">
                 AND t6.channel_proxy_name like CONCAT('%',#{bo.channelProxyName} , '%')
             </if>
-            <if test=" bo.signatoryStartTime != null and bo.signatoryStartTime != ''">
+            <if test=" bo.signatoryStartTime != null">
                 AND t.signatory_time &gt;= #{bo.signatoryStartTime}
             </if>
-            <if test=" bo.signatoryEndTime != null and bo.signatoryEndTime != ''">
+            <if test=" bo.signatoryEndTime != null ">
                 AND t.signatory_time &lt;= #{bo.signatoryEndTime}
             </if>
-            <if test=" bo.settlementStartTime != null and bo.settlementStartTime != ''">
+            <if test=" bo.settlementStartTime != null">
                 AND t.settlement_time &gt;= #{bo.settlementStartTime}
             </if>
-            <if test=" bo.settlementEndTime != null and bo.settlementEndTime != ''">
-                AND t.settlement_time &lt;= #{bosettlementEndTime.}
+            <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.signatrue_id
+        FROM
+            ta_contract_business t
+        LEFT JOIN ta_contract_template c ON t.contract_template_id = c.contract_template_id
+        LEFT JOIN ta_company_seal s ON t.seal_id = s.seal_id
+        WHERE
+        t.target_type = "raise"
+        AND t.target_id = #{raiseId}
+        AND t.`status` = 1
+    </select>
 </mapper>