修改二次销售补充信息推出库

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -4792,7 +4792,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 } else {
                     customerNumber = busSalesOrderVehicle.getTemporaryNo();
                 }
-            }
                 if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString()) || "11".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证--交回--转租中
                     ////营业费用_催收费用 上门催收费用--收回车辆费用（赎回通过后推送的费用）
                     if ("9".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){
@@ -5047,7 +5046,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if ("月还".equals(v.getReceivablesName()) || "资方逾期利息".equals(v.getReceivablesName())) {
                         Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                         all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
-                    voucherResultDetailDtoDf.setSummary("***扣回车辆再次销售款");
+                        voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售款");
                         voucherResultDetailDtoDf.setSubjectNo("1201.03.01");
                         //核算部门
                         voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
@@ -5231,7 +5230,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if ("资金占用费".equals(v.getReceivablesName())) {
                         Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
                         all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
-                    voucherResultDetailDtoDf2.setSummary("***扣回车辆再次销售款");
+                        voucherResultDetailDtoDf2.setSummary(customerNumber+"扣回车辆再次销售款");
                         voucherResultDetailDtoDf2.setSubjectNo("1201.02.03");
                         //核算部门
                         voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
@@ -5244,7 +5243,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if ("预计资方结清费用".equals(v.getReceivablesName())) {
                         Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
                         all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
-                    voucherResultDetailDtoDf3.setSummary("**扣回车辆再次销售-资方结清费用");
+                        voucherResultDetailDtoDf3.setSummary(planDetails.getVinNo()+"扣回车辆再次销售-资方结清费用");
                         voucherResultDetailDtoDf3.setSubjectNo("1201.03.01");
                         //核算部门
                         voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
@@ -5257,7 +5256,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if ("停车费".equals(v.getReceivablesName())) {
                         Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
                         all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
-                    voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-停车费");
+                        voucherResultDetailDtoJf2.setSummary(customerNumber+"扣回车辆再次销售-停车费");
                         voucherResultDetailDtoJf2.setSubjectNo("6601.32.02");
                         //核算部门
                         voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
@@ -5273,6 +5272,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                 }
             }
+
+        }
         //客户赎回收款
         if (all.compareTo(BigDecimal.ZERO) > 0) {
             Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
@@ -5288,7 +5289,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (otherMoney.compareTo(BigDecimal.ZERO) > 0) {
             Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto();
             all2 = all2.add(otherMoney);
-            voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-费用（违章、年检、保险、过户）");
+            voucherResultDetailDtoJf2.setSummary(customerNumber+"扣回车辆再次销售-费用（违章、年检、保险、过户）");
             voucherResultDetailDtoJf2.setSubjectNo("1133.10.00");
             //核算部门
             voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode());
@@ -5303,7 +5304,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
             }
             voucherResultDetailDtoJf.setSubjectNo(payType);
-            voucherResultDetailDtoJf.setSummary("***扣回车辆再次销售-收款" + "（" + collectionDate + "）");
+            voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）");
             voucherResultDetailDtoJf.setDebit(String.valueOf(all2));
             list2.add(voucherResultDetailDtoJf);
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyMapper.java

@@ -45,4 +45,6 @@ public interface LoanOutboundApplyMapper extends BaseMapper<LoanOutboundApply> {
     int updateLedgerStockStateBySid(@Param("key") String key, @Param("value") String value, @Param("date") String date, @Param("ledgerSid") String ledgerSid);
 
     String selectByBusVinSid(String busVinSid);
+
+    LoanOutboundApply selectByApplySid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyMapper.xml

@@ -205,4 +205,8 @@
                 se.receivablesSid in (select sid from anrui_riskcenter.loan_repayment_plan_details where busVinSid = #{busVinSid})
           AND se.auditState = '3' and se.receivablesName in('月还','预计资方结清费用')
     </select>
+
+    <select id="selectByApplySid" resultType="com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply">
+        select * from loan_out_bound_apply where applySid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java

@@ -1659,4 +1659,8 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
         return "/template/" + dateStr + "/" + pdfName;
     }
+
+    public LoanOutboundApply selectByApplySid(String sid) {
+        return baseMapper.selectByApplySid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerMapper.java

@@ -26,4 +26,6 @@ public interface LoanReturnVehLedgerMapper extends BaseMapper<LoanReturnVehLedge
     IPage<LoanReturnVehLedgerVo> selectPageVo(IPage<LoanReturnVehLedger> page, @Param(Constants.WRAPPER) QueryWrapper<LoanReturnVehLedgerQuery> qw);
 
     LoanReturnVehLedger selectByPSid(String sid);
+
+    LoanReturnVehLedger selVehLedgerBySid(String ledgerSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerMapper.xml

@@ -40,4 +40,10 @@
         from loan_return_veh_ledger
         where pSid = #{sid}
     </select>
+
+    <select id="selVehLedgerBySid" resultType="com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger">
+        select *
+        from loan_return_veh_ledger
+        where sid = #{ledgerSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturnvehledger/LoanReturnVehLedgerService.java

@@ -264,4 +264,8 @@ public class LoanReturnVehLedgerService extends MybatisBaseService<LoanReturnVeh
     public LoanReturnVehLedger selectByPSid(String sid) {
         return baseMapper.selectByPSid(sid);
     }
+
+    public LoanReturnVehLedger selVehLedgerBySid(String ledgerSid) {
+        return baseMapper.selVehLedgerBySid(ledgerSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerService.java

@@ -4,7 +4,12 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CustomerSecondSalesDto;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApplyDto;
+import com.yxt.anrui.riskcenter.api.loanoutboundapply.OutboundVinListDto;
+import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.FileQuery;
@@ -12,6 +17,9 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySale
 import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.LoanSecondarySalesCustomerDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescustomer.SalesInitVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.SalesVehVo;
+import com.yxt.anrui.riskcenter.biz.loanoutboundapply.LoanOutboundApplyService;
+import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostMapper;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
@@ -44,6 +52,10 @@ public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSe
     private LoanSecondarySalesCostMapper loanSecondarySalesCostMapper;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private LoanOutboundApplyService loanOutboundApplyService;
+    @Autowired
+    private LoanReturnVehLedgerService loanReturnVehLedgerService;
 
     public ResultBean saveSalesCustomer(LoanSecondarySalesCustomerDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -106,6 +118,10 @@ public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSe
             }
             baseMapper.updateById(loanSecondarySalesCustomer);
         }
+        if(loanSecondarySalesApply != null){
+            pushVehOutBound(loanSecondarySalesApply);
+        }
+
         return rb.success();
     }
 
@@ -161,4 +177,48 @@ public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSe
 
         return rb.success().setData(salesInitVo);
     }
+
+    private void pushVehOutBound(LoanSecondarySalesApply loanSecondarySalesApply) {
+        LoanOutboundApply loanOutboundApply = loanOutboundApplyService.selectByApplySid(loanSecondarySalesApply.getSid());
+        if(loanOutboundApply == null){
+            LoanOutboundApplyDto dto = new LoanOutboundApplyDto();
+            List<OutboundVinListDto> vinList = new ArrayList<>();
+            BeanUtil.copyProperties(loanSecondarySalesApply, dto);
+            dto.setApplySid(loanSecondarySalesApply.getSid());
+            dto.setBorrowerName(loanSecondarySalesApply.getLoanName());
+            dto.setBorrowerSid(loanSecondarySalesApply.getLoanSid());
+            dto.setCustomer(loanSecondarySalesApply.getCustomerName());
+            dto.setDisposalKey("03");
+            dto.setDisposal("二次销售");
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(loanSecondarySalesApply.getCustomerSid())) {
+                dto.setNewCustomerSid(loanSecondarySalesApply.getCustomerSid());
+                CrmCustomerTempVo customerTempVo = crmCustomerTempFeign.fetchSid(loanSecondarySalesApply.getCustomerSid()).getData();
+                if (null != customerTempVo) {
+                    if (StringUtils.isNotBlank(customerTempVo.getMobile())) {
+                        dto.setPhoneNum(customerTempVo.getMobile());
+                    }
+                }
+            }
+            if (StringUtils.isNotBlank(loanSecondarySalesApply.getCustomerName())) {
+                dto.setNewCustomer(loanSecondarySalesApply.getCustomerName());
+            }
+            List<SalesVehVo> vinLists = loanSecondarySalesVehService.selByMainSid(loanSecondarySalesApply.getSid());
+            if (!vinLists.isEmpty()) {
+                vinLists.forEach(v -> {
+                    OutboundVinListDto outboundVinListDto = new OutboundVinListDto();
+                    BeanUtil.copyProperties(v, outboundVinListDto);
+                    LoanReturnVehLedger loanReturnVehLedger = loanReturnVehLedgerService.selVehLedgerBySid(v.getLedgerSid());
+                    if (null != loanReturnVehLedger) {
+                        if (StringUtils.isNotBlank(loanReturnVehLedger.getLocation())) {
+                            outboundVinListDto.setLocation(loanReturnVehLedger.getLocation());
+                        }
+                    }
+                    vinList.add(outboundVinListDto);
+                });
+            }
+            dto.setVinList(vinList);
+            loanOutboundApplyService.saveOutbound(dto);
+        }
+
+    }
 }