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

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

@@ -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())) {
@@ -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())) {
@@ -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())) {

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

@@ -41,6 +41,7 @@ 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;
@@ -590,6 +591,7 @@ public class TaCompanyController extends BaseController {
             taContract.setContractDownloadUrl(download_url);
             taContract.setContractViewUrl(viewpdf_url);
             taContract.setStatus(CommConstant.STATUS_NORMAL);
+            taContract.setCustomerTime(LocalDateTime.now());
             taContract.setReason(parameterMap.get("result_desc")[0]);
             iTaContractService.updateById(taContract);
         }else{

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

@@ -265,9 +265,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
                 taContract.setCustomerIdcard(personJson.getString("idCard"));
             }
         }
-        taContract.setCustomerTime(LocalDateTime.now());
-        taContractMapper.updateById(taContract);
 
+        taContractMapper.updateById(taContract);
         return signUrl;
     }
 

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

@@ -96,11 +96,11 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         String verifyed_way = "4";
         String page_modify = "1";
         String notify_url = fadadaProperties.getCompanyNotify();
-        String redirectUrl = URLEncoder.encode(URLEncoder.encode("/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId(), "utf-8"), "utf-8");
-        String return_url=  fadadaProperties.getAuthReturnUrl() + "?appid=123&redirect="+ redirectUrl;
+        String redirectUrl = URLEncoder.encode("/onlineSelling/pages/raiseMoney/Certification?id=" + taRaiseRecord.getRaiseRecordId(), "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,URLEncoder.encode(return_url, "utf-8"),null,customer_ident_type,
+                page_modify,notify_url,return_url,null,customer_ident_type,
                 taRaiseRecord.getIdcard(),taRaiseRecord.getTel(),null,"1","1");
 
         String data = JSON.parseObject(personResult).getString("data");

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);
+        }
     }
 
     /**