From 79a4134721d5e5f5efddd4a1a2b25cc0b416385d Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 21 Dec 2023 09:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=BA=B3=E4=BB=98=E6=AC=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseOutsourcingApplicationService.java               | 1 +
 .../BaseVehicleActualSalesService.java                   | 1 +
 .../base/biz/busvehicleapply/BusVehicleApplyService.java | 1 +
 .../anrui/fin/api/finpaymentrecord/FinPaymentrecord.java | 2 ++
 .../fin/api/finpaymentrecord/FinPaymentrecordDto.java    | 3 +++
 .../fin/api/finpaymentrecord/FinPaymentrecordVo.java     | 2 ++
 .../fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml  | 3 ++-
 .../biz/finpaymentrecord/FinPaymentrecordService.java    | 9 +++++++++
 .../biz/scmvehicleexamine/ScmVehicleExamineService.java  | 1 +
 9 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index 4b7034ea88..215e9ddb9f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -789,6 +789,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode());
         //业务sid
         finPaymentrecordDto.setBusSid(booad.getSid());
+        finPaymentrecordDto.setBusRemarks(booad.getRemarks());
         finPaymentrecordFeign.save(finPaymentrecordDto);
     }
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
index 41d56fa3b0..afacb408fe 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
@@ -650,6 +650,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                         if (baseManufacturer != null) {
                             finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode());
                         }
+                        finPaymentrecordDto.setBusRemarks(v.getPayRemark());
                         finPaymentrecordFeign.save(finPaymentrecordDto);
                     }
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index c7b48b1573..394b0d3b42 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -717,6 +717,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                         finPaymentrecordDto.setPayCode(baseManufacturer.getManufacturerCode());
                     }
                     finPaymentrecordDto.setBusSid(r.getData());
+                    finPaymentrecordDto.setBusRemarks(busVehicleApply.getPayRemarks());
                     finPaymentrecordFeign.save(finPaymentrecordDto);
                 }
             } else {
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
index 9c4640f4bb..2ef3a0209a 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
@@ -108,4 +108,6 @@ public class FinPaymentrecord extends BaseEntity {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName; // 采购系统名称
+    @ApiModelProperty("付款时备注内容")
+    private String busRemarks;
 }
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
index f6c9cf9a96..3678fca33b 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
@@ -96,4 +96,7 @@ public class FinPaymentrecordDto implements Dto {
     private String purchaseSystemSid; // 采购系统sid
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName; // 采购系统名称
+
+    @ApiModelProperty("付款时备注内容")
+    private String busRemarks;
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
index 1c13eb0c1b..fc35e8c15f 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
@@ -88,5 +88,7 @@ public class FinPaymentrecordVo implements Vo {
     private String payFile;
     @ApiModelProperty("供应商编码")
     private String payCode;
+    @ApiModelProperty("付款时备注")
+    private String busRemarks;
 
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
index e96e634e6f..feb907a3ca 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
@@ -23,7 +23,8 @@
                fp.receiveBank,
                fp.cost,
                fp.payFile,
-               fp.payCode
+               fp.payCode,
+        fp.busRemarks
         FROM fin_paymentrecord fp
         LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid
         <where>
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 758e7ce750..b7989df245 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
@@ -292,6 +292,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         List<String> list = new ArrayList<>();
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
+            FinPaymentrecord finPaymentrecordOne = null;
+            if(dto.getCost()<finPaymentrecord.getAccountsReceive()){//实收金额小于应收金额
+                finPaymentrecordOne = new FinPaymentrecord();
+                BeanUtil.copyProperties(finPaymentrecord,finPaymentrecordOne,"sid");
+                finPaymentrecordOne.setAccountsReceive(finPaymentrecord.getAccountsReceive()-dto.getCost());
+            }
             BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
             List<String> payFiles = dto.getPayFiles();
             if (payFiles.size() > 0) {
@@ -405,6 +411,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 log.error("推送数据失败=========================" + e.getMessage());
                 return rb.setMsg("推送数据失败");
             }
+            if(finPaymentrecordOne != null){
+                baseMapper.insert(finPaymentrecordOne);
+            }
         }
         return rb.success();
     }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
index 49f496c7f1..c61372099e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
@@ -769,6 +769,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                             if (baseManufacturerAllVo != null) {
                                 finPaymentrecordDto.setPayCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());//供应商编码
                             }
+                            finPaymentrecordDto.setBusRemarks(outsourcingApplicationDetailsVo.getRemarks());
                             finPaymentrecordFeign.save(finPaymentrecordDto);
                         }
                     }