From 7f9829a11ab9ca80ed587ba716710f009aae1c18 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 28 Oct 2024 17:33:14 +0800
Subject: [PATCH] 1

---
 .../biz/finpaymentrecord/FinPaymentrecordService.java  | 10 +++++-----
 .../ScmCollectionRebateService.java                    |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index c8f6069570..4132d6a53e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -385,7 +385,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
             //到回款返利申请
-            if (finPaymentrecord.getCostTypeValue().equals("厂家车款") && !finPaymentrecord.getPayWayValue().equals("返利抵车款")) {
+            if (finPaymentrecord.getCostTypeValue().equals("厂家车款") && !dto.getPayWayValue().equals("返利抵车款")) {
                 ScmCollectionRebateDto scmCollectionRebateDto = new ScmCollectionRebateDto();
                 List<ScmCollectionRebateVehDto> scmCollectionRebateVehDtos = new ArrayList<>();
                 FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid());
@@ -393,12 +393,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(finPaymentapply.getSid());
                 scmCollectionRebateDto.setBrandSid(finPaymentapply.getCarBrandSid());
                 scmCollectionRebateDto.setBrandName(finPaymentapply.getCarBrandName());
-                scmCollectionRebateDto.setCollectionTypeKey(finPaymentrecord.getPayWayKey());
-                scmCollectionRebateDto.setCollectionTypeValue(finPaymentrecord.getPayWayValue());
+                scmCollectionRebateDto.setCollectionTypeKey(dto.getPayWayKey());
+                scmCollectionRebateDto.setCollectionTypeValue(dto.getPayWayValue());
                 scmCollectionRebateDto.setManufaSaleChannel("");
                 scmCollectionRebateDto.setManufaSaleChannelValue(finPaymentapplyDetails.getActualPay());
-                scmCollectionRebateDto.setCollectionMoney(finPaymentrecord.getCost());
-                scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(finPaymentrecord.getPayDate()));
+                scmCollectionRebateDto.setCollectionMoney(new BigDecimal(dto.getCost()));
+                scmCollectionRebateDto.setCollectionDate(DateUtil.formatDate(dto.getPayDate()));
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getCreateOrgSid()).getData();
                 scmCollectionRebateDto.setCreateOrgSid(finPaymentrecord.getCreateOrgSid());
                 scmCollectionRebateDto.setCreateOrgName(sysOrganizationVo.getName());
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
index c111c0bb54..30120aaf84 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
@@ -176,6 +176,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
     public ResultBean saveOrUpdateDto(ScmCollectionRebateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        dto.setUploadDate(DateUtil.formatDate(DateUtil.parseDate(dto.getUploadDate())));
         List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
         if (StringUtils.isBlank(dtoSid)) {
             String s = this.insertByDto(dto);
@@ -371,7 +372,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
         for (String sid : sids) {
             ScmCollectionRebate scmCollectionRebate = fetchBySid(sid);
             scmCollectionRebate.setUploadMoney(scmCollectionRebate.getEstimateRebate());
-            scmCollectionRebate.setUploadDate(stayCheckUpAgre.getUpDate());
+            scmCollectionRebate.setUploadDate(DateUtil.formatDate(DateUtil.parseDate(stayCheckUpAgre.getUpDate())));
             scmCollectionRebate.setAdjustmentMoney(new BigDecimal("0"));
             saveOrUpdate(scmCollectionRebate);
         }