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

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

@@ -517,5 +517,9 @@ public class TaCompanyController extends BaseController {
                                   @RequestParam(value = "msg_digest",required = false) String msg_digest,
                                   HttpServletRequest request) {
         logger.info("企业认证回调函数参数:交易号 {},合同编号 {}，签章结果代码 {}，签章结果描述 ，{}, 下载地址{}, 查看地址 {},请求时间 {}, 摘要 {} ",transaction_id,contract_id,result_code,result_desc,download_url,viewpdf_url,timestamp,msg_digest);
+        TaContract taContract = iTaContractService.getById(contract_id);
+        taContract.setContractDownloadUrl(download_url);
+        taContract.setContractViewUrl(viewpdf_url);
+        iTaContractService.updateById(taContract);
     }
 }

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

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

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

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

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

@@ -95,6 +95,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
 
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taRaiseRecord.getRaiseId());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
 
         //先入合同表
         TaContract taContract = new TaContract();
@@ -140,6 +143,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         taContract.setContractViewUrl(autoSignResultJson.getString("viewpdf_url"));
         taContract.setStatus(1);
         taContractMapper.updateById(taContract);
+
+        //企业名称
+        taContract.setCompanyName(taContractBusiness.getCompanyName());
         return taContract;
     }
 
@@ -151,8 +157,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
      * @return
      */
     @Override
-    public String
-    manualContract(TaContract taContract, TaPerson person) {
+    public String manualContract(TaContract taContract, TaPerson person) throws Exception {
         //获取客户信息
         QueryWrapper<TaContractUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mini_openid",person.getMiniOpenid());
@@ -160,6 +165,9 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
 
         //根据raiseId获取合同的所有参数
         TaContractBusiness taContractBusiness = taContractMapper.selectContractInfoByRaiseId(taContract.getTargetId().toString());
+        if (null == taContractBusiness){
+            throw new Exception("无合同模板，请和置业顾问联系");
+        }
 
         //手动签署合同
         String timeStamp = HttpsUtil.getTimeStamp();
@@ -173,7 +181,7 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setSign_keyword(taContractBusiness.getCustomerKeywords());
         req.setKeyword_strategy(taContractBusiness.getCustomerStrategy());
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-//        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
+        req.setReturn_url("/onlineSelling/pages/raiseMoney/signResult");
         req.setNotify_url(fadadaProperties.getSignNotify());
         String signUrl = base.invokeExtSign(req);
         return signUrl;

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

@@ -86,7 +86,7 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         String verifyed_way = "0";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
-//        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
+        String return_url= "/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId();
         String customer_ident_type = "0";
         String personResult = personverify.invokePersonVerifyUrl(customer_id,verifyed_way,
                 page_modify,notify_url,null,null,customer_ident_type,

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

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

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

@@ -186,7 +186,7 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
                 new String[]{} : taRaise.getInviteTel().split("\n");
 
-        Arrays.asList(inviteTelArr).stream().forEach(record -> {
+        Arrays.asList(inviteTelArr).stream().distinct().forEach(record -> {
             TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
             taRaiseInvite.setOrgId(orgId);
             taRaiseInvite.setRaiseId(taRaise.getRaiseId());
@@ -194,21 +194,21 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
             taRaiseInvite.setSalesBatchId(taRaise.getSalesBatchId());
             taRaiseInvite.setCreateDate(LocalDateTime.now());
 
-//            // 为新增 直接增加，跳过重复添加数据校验
-//            if (isAdd) {
-//                taRaiseInvite.setInviteTel(record);
-//                taRaiseInviteList.add(taRaiseInvite);
-//            } else {
-            QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
-            taRaiseInviteQueryWrapper.eq("org_id", orgId);
-            taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
-            taRaiseInviteQueryWrapper.eq("invite_tel", record);
-            TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
-            if (queryResult == null) {
+            // 为新增 直接增加，跳过重复添加数据校验
+            if (isAdd) {
                 taRaiseInvite.setInviteTel(record);
                 taRaiseInviteList.add(taRaiseInvite);
+            } else {
+                QueryWrapper<TaRaiseInvite> taRaiseInviteQueryWrapper = new QueryWrapper<>();
+                taRaiseInviteQueryWrapper.eq("org_id", orgId);
+                taRaiseInviteQueryWrapper.eq("raise_id", taRaise.getRaiseId());
+                taRaiseInviteQueryWrapper.eq("invite_tel", record);
+                TaRaiseInvite queryResult = taRaiseInviteService.getOne(taRaiseInviteQueryWrapper);
+                if (queryResult == null) {
+                    taRaiseInvite.setInviteTel(record);
+                    taRaiseInviteList.add(taRaiseInvite);
+                }
             }
-//            }
         });
         return taRaiseInviteService.saveBatch(taRaiseInviteList);
     }

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

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