Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java

@@ -59,6 +59,10 @@ public class LoanBeCollectionApplyQuery implements Query {
     private String createStartTime;
     @ApiModelProperty("申请结束日期")
     private String createEndTime;
+    @ApiModelProperty("办结开始日期")
+    private String modifyStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String modifyEndTime;
     @ApiModelProperty("催收措施")
     private String collMeasure;
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java

@@ -65,6 +65,8 @@ public class LoanBeCollectionApplyVo implements Vo {
     @ApiModelProperty("申请日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
+    @ApiModelProperty("办结日期")
+    private String modifyTime;
 	@ApiModelProperty("催收措施")
     private String collMeasure;
     @ApiModelProperty("备注")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.riskcenter.api.loanbecollectionrecord;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class LoanBeCollectionRecordVehInit {
@@ -34,19 +36,11 @@ public class LoanBeCollectionRecordVehInit {
     private String beOverdueMoney;
     @ApiModelProperty("逾期金额换算期数")
     private String beOverdueMoneyAndPeriod;
-
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
     @ApiModelProperty("销售订单车辆sid")
     private String saleVehSid;
-    @ApiModelProperty("开票管理sid")
-    private String kpglSid;
-    @ApiModelProperty("月还明细sid")
-    private String yhmxSid;
-    @ApiModelProperty("金融方案sid")
-    private String jrfaSid;
-    @ApiModelProperty("家访考察报告sid")
-    private String kcbgSid;
-    @ApiModelProperty("家访考察资料sid")
-    private String kczlSid;
+
+    @ApiModelProperty
+    private List<LoanBeCollectionVehFile> sids;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java

@@ -49,7 +49,7 @@ public class DkRecordVo implements Vo {
 
     @ApiModelProperty("分公司名称")
     private String useOrgName;
-    @ApiModelProperty("申请部门名称")
+    @ApiModelProperty("销售部门名称")
     private String deptName;
     @ApiModelProperty("垫款申请编号")
     private String billNo;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyQuery.java

@@ -62,6 +62,10 @@ public class LoanBePadsincereApplyQuery implements Query {
     private String createStartTime;
     @ApiModelProperty("申请结束日期")
     private String createEndTime;
+    @ApiModelProperty("办结开始日期")
+    private String modifyStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String modifyEndTime;
 
     private String userSid;
     private String orgPath;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereApplyVo.java

@@ -64,6 +64,8 @@ public class LoanBePadsincereApplyVo implements Vo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("申请日期")
     private Date createTime;
+    @ApiModelProperty("办结日期")
+    private String modifyTime;
 	@ApiModelProperty("申请编号")
     private String billNo;
     @ApiModelProperty("备注")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml

@@ -21,7 +21,7 @@
 
 	<update id="updateFlowFiled">
 		UPDATE loan_be_collection_apply
-		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}, modifyTime = NOW()
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.biz.loanbecollectionapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -59,6 +60,7 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecor
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
 import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -195,12 +197,23 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
                 );
+        qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
+                );
         if (StringUtils.isNotBlank(query.getCollMeasure())) {
             qw.like("collMeasure", query.getCollMeasure());
         }
         qw.orderByDesc("createTime");
         IPage<LoanBeCollectionApply> page = PagerUtil.queryToPage(pq);
         IPage<LoanBeCollectionApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (LoanBeCollectionApplyVo record : pagging.getRecords()) {
+            if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) {
+                DateTime modifyTime = DateUtil.parse(record.getModifyTime());
+                record.setModifyTime(DateUtil.formatDate(modifyTime));
+            } else {
+                record.setModifyTime("未办结");
+            }
+        }
         PagerVo<LoanBeCollectionApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml

@@ -43,7 +43,7 @@
         a1.dueDate AS firstBeDate,
         COUNT(a1.sid) AS beOverduePeriod,
         SUM(a1.yq_total) AS beOverdueMoney,
-        SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod
+        ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod
         FROM
         (SELECT
         lrpd.sid,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java

@@ -38,6 +38,8 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.*;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
@@ -197,25 +199,45 @@ public class LoanBeCollectionRecordService extends MybatisBaseService<LoanBeColl
 		loanBeCollectionRecordInit.setSpouseMobile(loanHomevisitInvestigateCustomerDetailsVo.getSpouseMobile());
 		List<LoanBeCollectionRecordVehInit> loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
 		for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
+			List<LoanBeCollectionVehFile> loanBeCollectionVehFiles = new ArrayList<>();
 			loanBeCollectionRecordVehInit.setCustNameAndPhone(loanBeCollectionRecordVehInit.getCustName() + loanBeCollectionRecordVehInit.getCustPhone());
 			BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData();
 			BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData();
 			loanBeCollectionRecordVehInit.setReaRepaymentNameAndPhone(busSalesOrderVehicle1.getReaRepaymentName() + busSalesOrderVehicle1.getReaRepaymentPhone());
 			//催收记录sid
-			loanBeCollectionRecordVehInit.setSaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid());
+			LoanBeCollectionVehFile loanBeCollectionVehFile1 = new LoanBeCollectionVehFile();
+			loanBeCollectionVehFile1.setName("催收记录");
+			loanBeCollectionVehFile1.setSid(loanBeCollectionRecordVehInit.getSaleVehSid());
+			loanBeCollectionVehFiles.add(loanBeCollectionVehFile1);
 			//开票管理sid
 			FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
-			//loanBeCollectionRecordVehInit.setKpglSid(finVehicleInvoice.getSid());
+			LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile();
+			loanBeCollectionVehFile2.setName("开票信息");
+			loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid());
+			loanBeCollectionVehFiles.add(loanBeCollectionVehFile2);
 			//月还明细sid
-			loanBeCollectionRecordVehInit.setYhmxSid(saleVehSid);
+			LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile();
+			loanBeCollectionVehFile3.setName("月还明细");
+			loanBeCollectionVehFile3.setSid(saleVehSid);
+			loanBeCollectionVehFiles.add(loanBeCollectionVehFile3);
 			//金融方案sid
-			LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
-			loanBeCollectionRecordVehInit.setJrfaSid(loanSolutions.getSid());
+			LoanBeCollectionVehFile loanBeCollectionVehFile4 = new LoanBeCollectionVehFile();
+			loanBeCollectionVehFile4.setName("金融方案");
+			loanBeCollectionVehFile4.setSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
+			loanBeCollectionVehFiles.add(loanBeCollectionVehFile4);
 			//家访考察报告sid
 			String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
-			loanBeCollectionRecordVehInit.setKcbgSid(sid);
+			LoanBeCollectionVehFile loanBeCollectionVehFile5 = new LoanBeCollectionVehFile();
+			loanBeCollectionVehFile5.setName("家访考察报告");
+			loanBeCollectionVehFile5.setSid(sid);
+			loanBeCollectionVehFiles.add(loanBeCollectionVehFile5);
 			//家访考察资料sid
-			loanBeCollectionRecordVehInit.setKczlSid(sid);
+			LoanBeCollectionVehFile loanBeCollectionVehFile6 = new LoanBeCollectionVehFile();
+			loanBeCollectionVehFile6.setName("家访考察资料");
+			loanBeCollectionVehFile6.setSid(sid);
+			loanBeCollectionVehFiles.add(loanBeCollectionVehFile6);
+			loanBeCollectionRecordVehInit.setSids(loanBeCollectionVehFiles);
+			loanBeCollectionRecordVehInits.add(loanBeCollectionRecordVehInit);
 		}
 		loanBeCollectionRecordInit.setLoanBeCollectionRecordVehInitList(loanBeCollectionRecordVehInits);
 		return loanBeCollectionRecordInit;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -18,7 +18,7 @@
         a1.dueDate AS firstBeDate,
         COUNT(a1.sid) AS beOverduePeriod,
         SUM(a1.yq_total) AS beOverdueMoney,
-        SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
+        ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod,
         SUM(a1.yd_dkje) AS advMoney,
         SUM(a1.yd_zjzyf) AS fundPossCostMoney,
         a1.riskStaffUserSid,
@@ -87,7 +87,7 @@
                 a1.dueDate AS firstBeDate,
                 COUNT(a1.sid) AS beOverduePeriod,
                 SUM(a1.yq_total) AS beOverdueMoney,
-                SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
+                ROUND(SUM(a1.yq_hsqs), 1) AS beOverdueMoneyAndPeriod,
                 a1.busVinSid AS saleVehSid,
                 a1.salesOrderSid
         FROM

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml

@@ -20,7 +20,7 @@
 
     <update id="updateFlowFiled">
         UPDATE loan_be_padsincere_apply
-        SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}, modifyTime = NOW()
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -51,7 +51,7 @@
     <select id="dkListPage" resultType="com.yxt.anrui.riskcenter.api.loanbepadsincereapply.DkRecordVo">
         SELECT
         la.useOrgName,
-        la.deptName,
+        bo.orgName AS deptName,
         la.billNo,
         lv.vinNo,
         lv.`loanContractNo`,
@@ -73,6 +73,10 @@
         loan_be_padsincere_veh lv
         LEFT JOIN loan_be_padsincere_apply la
         ON lv.mainSid = la.sid
+        LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
+        ON bv.`sid` = lv.`saleVehSid`
+        LEFT JOIN anrui_buscenter.`bus_sales_order` bo
+        ON bo.`sid` = bv.`salesOrderSid`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.riskcenter.biz.loanbepadsincereapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -196,9 +197,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')"
                 );
+        qw.apply(StringUtils.isNotBlank(query.getModifyStartTime()), "date_format (modifyTime,'%Y-%m-%d') >= date_format('" + query.getModifyStartTime() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getModifyEndTime()), "date_format (modifyTime,'%Y-%m-%d') <= date_format('" + query.getModifyEndTime() + "','%Y-%m-%d')"
+                );
         qw.orderByDesc("createTime");
         IPage<LoanBePadsincereApply> page = PagerUtil.queryToPage(pq);
         IPage<LoanBePadsincereApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (LoanBePadsincereApplyVo record : pagging.getRecords()) {
+            if ("终止".equals(record.getNodeState()) || "已办结".equals(record.getNodeState())) {
+                DateTime modifyTime = DateUtil.parse(record.getModifyTime());
+                record.setModifyTime(DateUtil.formatDate(modifyTime));
+            } else {
+                record.setModifyTime("未办结");
+            }
+        }
         PagerVo<LoanBePadsincereApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -246,6 +258,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                 return p;
             }
         }
+        qw.eq("la.nodeState", "已办结");
         if (StringUtils.isNotBlank(query.getUseOrgName())) {
             qw.like("la.useOrgName", query.getUseOrgName());
         }
@@ -268,7 +281,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             qw.like("lv.bankName", query.getBankName());
         }
         if (StringUtils.isNotBlank(query.getCustName())) {
-            qw.like("lv.bankContractNo", query.getCustName());
+            qw.like("lv.customerName", query.getCustName());
         }
         if (StringUtils.isNotBlank(query.getBorrowerName())) {
             qw.like("lv.borrowerName", query.getBorrowerName());
@@ -415,6 +428,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                 loanBePadsincereVehDetailsVo.setBorrowerName(loanRepaymentScheduleDetailsVo.getBorrowerName());
                 loanBePadsincereVehDetailsVo.setPeriod(bePadsincereExcelInfo.getPeriod());
                 String sysBeMoney = loanRepaymentPlanDetailsService.selBeMoney(loanRepaymentScheduleDetailsVo.getVinNo(), bePadsincereExcelInfo.getPeriod(), bePadsincereExcelInfo.getBankContractNo());
+                if (StringUtils.isBlank(sysBeMoney)) {
+                    sysBeMoney = "0";
+                }
                 loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney);
                 loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBePrincipal()) / loanRepaymentScheduleDetailsVos.size()));
                 loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBeDefInter()) / loanRepaymentScheduleDetailsVos.size()));

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -1199,6 +1199,9 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
             qw.like("p.staffName", pagerQuery.getStaffName());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) {
+            qw.like("h.buckleKey", pagerQuery.getBuckleKey());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
             qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -25,6 +25,7 @@
         WHERE lrpd.vinNo = #{no}
           AND lrpd.period = #{period}
           AND lrpd.bankContractNo = #{bankContractNo}
+          AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)
     </select>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -59,6 +59,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessagePushTransferDto;
+import com.yxt.messagecenter.api.message.PushMessageQuery;
 import com.yxt.messagecenter.api.messagelist.MessageListDto;
 import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1108,21 +1109,33 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         System.out.println("还款发送短信：" + res);
                         System.out.println(contentCustomer);
                         String contentStaff = "您的贷款客户" + customer + "的还款计划表已生成";
-                        //消息推送
-                        MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
-                        messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
-                        messagePushTransferDto.setMsgType("业务");
-                        messagePushTransferDto.setMsgTitle("生成还款计划表");
-                        messagePushTransferDto.setMsgContent(contentStaff);
-                        messagePushTransferDto.setMsgSource("还款计划表");
-                        messagePushTransferDto.setSenderSid(sendSid);
-                        messagePushTransferDto.setSenderName(sendName);
-                        messagePushTransferDto.setSenderDeptSid(sendDeptSid);
-                        messagePushTransferDto.setSenderDeptName(sendDept);
-                        messagePushTransferDto.setBusinessSid(schedule.getSid());
-                        messagePushTransferDto.setReceiveSids(staffSid);
-                        messagePushTransferDto.setReceiveNames(staffName);
-                        messageFeign.pushTransferMessage(messagePushTransferDto);
+//                        //消息推送
+//                        MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto();
+//                        messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799");
+//                        messagePushTransferDto.setMsgType("业务");
+//                        messagePushTransferDto.setMsgTitle("生成还款计划表");
+//                        messagePushTransferDto.setMsgContent(contentStaff);
+//                        messagePushTransferDto.setMsgSource("还款计划表");
+//                        messagePushTransferDto.setSenderSid(sendSid);
+//                        messagePushTransferDto.setSenderName(sendName);
+//                        messagePushTransferDto.setSenderDeptSid(sendDeptSid);
+//                        messagePushTransferDto.setSenderDeptName(sendDept);
+//                        messagePushTransferDto.setBusinessSid(schedule.getSid());
+//                        messagePushTransferDto.setReceiveSids(staffSid);
+//                        messagePushTransferDto.setReceiveNames(staffName);
+//                        messageFeign.pushTransferMessage(messagePushTransferDto);
+                        //发送通知给销售专员
+                        List<String> receIveUserSidList = new ArrayList<>();
+                        receIveUserSidList.add(staffSid);
+                        PushMessageQuery pushMessageQuery = new PushMessageQuery();
+                        pushMessageQuery.setReceivedSids(receIveUserSidList);
+                        pushMessageQuery.setModuleName("风控");
+                        pushMessageQuery.setMsgContent(contentStaff);
+                        pushMessageQuery.setApp_type("2");
+                        pushMessageQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
+                        pushMessageQuery.setMsgTitle("还款计划提醒");
+                        // 消息推送
+                        messageFeign.pushNoUriMessage(pushMessageQuery);
                     }
                 });
             } catch (Exception e) {