修改

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -46,6 +46,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.*;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*;
@@ -57,6 +58,7 @@ import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo;
 import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanrelievemortgage.LoanRelieveMortgageService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost.LoanRepurchaseCompanyCostService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loansettleapply.LoanSettleApplyService;
@@ -128,7 +130,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp;
     @Autowired
     private MessageListFeign messageListFeign;
-
+    @Autowired
+    private LoanRelieveMortgageService loanRelieveMortgageService;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
@@ -740,7 +743,30 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 baseMapper.updateById(repurchaseApply);
                 //更新车辆表回购状态为1
                 baseMapper.updateBus(repurchaseApply.getBusVinSid());
-
+                //推送待解抵
+                LoanRelieveMortgageSaveDto loanRelieveMortgageSaveDto = new LoanRelieveMortgageSaveDto();
+                loanRelieveMortgageSaveDto.setCreateBySid(repurchaseApply.getCreateBySid());
+                loanRelieveMortgageSaveDto.setUseOrgSid(repurchaseApply.getUseOrgSid());
+                loanRelieveMortgageSaveDto.setUseOrgName(repurchaseApply.getUseOrgName());
+                loanRelieveMortgageSaveDto.setOrgSidPath(repurchaseApply.getOrgSidPath());
+                loanRelieveMortgageSaveDto.setBusVinSid(repurchaseApply.getBusVinSid());
+                loanRelieveMortgageSaveDto.setVinNo(repurchaseApply.getVinNo());
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(repurchaseApply.getBusVinSid()).getData();
+                loanRelieveMortgageSaveDto.setVehSid(busSalesOrderVehicle.getLinkSid());
+                loanRelieveMortgageSaveDto.setVehMark(repurchaseApply.getVehMark());
+                loanRelieveMortgageSaveDto.setLoanContractNo(repurchaseApply.getLoanContractNo());
+                loanRelieveMortgageSaveDto.setBankContractNo(repurchaseApply.getBankContractNo());
+                loanRelieveMortgageSaveDto.setDept(repurchaseApply.getCreateDept());
+                loanRelieveMortgageSaveDto.setDeptSid(repurchaseApply.getCreateDeptSid());
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+                loanRelieveMortgageSaveDto.setSalesman(busSalesOrder.getStaffName());
+                loanRelieveMortgageSaveDto.setSalesmanSid(busSalesOrder.getStaffSid());
+                loanRelieveMortgageSaveDto.setBorrowerName(repurchaseApply.getLoanName());
+                loanRelieveMortgageSaveDto.setBorrowerSid(repurchaseApply.getLoanSid());
+                loanRelieveMortgageSaveDto.setCustomer(repurchaseApply.getCustomerName());
+                loanRelieveMortgageSaveDto.setCustomerSid(repurchaseApply.getCustomerSid());
+                loanRelieveMortgageSaveDto.setBankName(repurchaseApply.getBankName());
+                loanRelieveMortgageService.saveRelieveMortgage(loanRelieveMortgageSaveDto);
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -978,11 +978,38 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
                     //推送财务凭证
                     pushSettleVoucher2(loanSettleApply, check, settleVoucherVos);
-                    if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
+                    if (StringUtils.isBlank(loanSettleApply.getBusSid())) {//非回购
-
+                        //推送待解抵
+                        pushRelieveMortgag(loanSettleApply);
                     }
                 }
                 baseMapper.updateById(loanSettleApply);
+            } else {
+                //极光推送
+                loanSettleApply = fetchBySid(businessSid);
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                messageFlowVo.setProcDefId(loanSettleApply.getProcDefId());
+                messageFlowVo.setProcInsId(loanSettleApply.getProcInstId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("结清申请");
+                messageFlowableQuery.setMsgContent(loanSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                messageFlowableQuery.setMsgTitle("结清申请");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    /*
+    * 推送待解抵
+    * */
+    private void pushRelieveMortgag(LoanSettleApply loanSettleApply) {
         LoanRelieveMortgageSaveDto loanRelieveMortgageSaveDto = new LoanRelieveMortgageSaveDto();
         loanRelieveMortgageSaveDto.setCreateBySid(loanSettleApply.getCreateBySid());
         loanRelieveMortgageSaveDto.setUseOrgSid(loanSettleApply.getUseOrgSid());
@@ -1006,26 +1033,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         loanRelieveMortgageSaveDto.setCustomerSid(loanSettleApply.getCustomerSid());
         loanRelieveMortgageSaveDto.setBankName(loanSettleApply.getBankName());
         loanRelieveMortgageService.saveRelieveMortgage(loanRelieveMortgageSaveDto);
-            } else {
-                //极光推送
-                loanSettleApply = fetchBySid(businessSid);
-                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo, messageFlowVo);
-                messageFlowVo.setProcDefId(loanSettleApply.getProcDefId());
-                messageFlowVo.setProcInsId(loanSettleApply.getProcInstId());
-                messageFlowableQuery.setUfVo(messageFlowVo);
-                messageFlowableQuery.setAppMap(appMap);
-                messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("结清申请");
-                messageFlowableQuery.setMsgContent(loanSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                messageFlowableQuery.setMsgTitle("结清申请");
-                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-            }
-            return rb.success().setData(resultBean.getData());
-        } else {
-            return rb.setMsg("操作失败!提交的数据不一致");
-        }
     }
 
     //---------------------------------- 结清生成应收新逻辑 ---------------------
@@ -3686,6 +3693,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
         //推送财务凭证
         pushSettleVoucher2(loanSettleApply, 1, settleVoucherVos);
+        //非回购
+        if (StringUtils.isBlank(loanSettleApply.getBusSid())) {
+            //推送待解抵
+            pushRelieveMortgag(loanSettleApply);
+        }
         return rb.success();
     }