From 1e92340313d863105038405b9fbebbdd0114ee92 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 10 May 2023 15:15:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 88a4c04499..09874143b0 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -1954,10 +1954,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                             //外部金融：成交价 = 订金+车款+厂家贴息-服务费
                                             leftAll = leftAll.add(singleFinalPrice);
                                             if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
-                                                leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
+                                                leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
                                             }
                                             if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
-                                                leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
+                                                leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
                                             }
                                             rightAll = rightAll.add(bigDecimalVinAll);
                                         } else {

From d8886a9f06a3eb418e169d18d10e2b14df4e8313 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 10 May 2023 15:34:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
index 6c331c44fe..b8adc8baab 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
@@ -42,7 +42,7 @@
         select *
         from base_vehinstall
         where useOrgSid = #{useOrgSid}
-          and vinNo = #{vinNo}
+          and vinNo like concat('%',#{vinNo},'%')
     </select>
 
     <select id="seletByVinAndUseOrg" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">

From f79d8a85c6b32782aee3b0c14e495952ad4beef6 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 10 May 2023 16:27:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinBillApplicationDetailsVo.java            |  2 ++
 .../FinBillApplicationService.java              | 14 ++++++++++++++
 .../advanceInvoice/AdvanceInvoiceDto.java       |  5 +++++
 .../advanceInvoice/AdvanceInvoiceInfoVo.java    |  8 ++++++--
 .../AppBusAdvanceGinvoiceapplyService.java      | 17 +++++++++++++++++
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
index 4a18a74bdf..ac0e67ec81 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
@@ -138,6 +138,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private String billNo; // 单据编号
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 65582f74be..96ed60fcc6 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -1363,6 +1363,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             //欠款金额合计
             BigDecimal qkMoneyTotal = qkMoneyOne.multiply(new BigDecimal(finBillVehicles.size()));
             finBillApplication.setArrearsMoney(qkMoneyTotal.toString());
+            //单台开票金额
+            BigDecimal oneBillMoney = finBillApplication.getOneBillMoney();
+            //计算开票金额合计
+            BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
+            finBillApplication.setTotalBillMoney(totalBillMoney);
             save(finBillApplication);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
@@ -1543,6 +1548,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setBillStateKey("004");
             finBillApplication.setBillStateValue("欠款领票");
             finBillApplication.setNum(finBillVehicles.size());
+            //单台开票金额
+            BigDecimal oneBillMoney = finBillApplication.getOneBillMoney();
+            //计算开票金额合计
+            BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
+            finBillApplication.setTotalBillMoney(totalBillMoney);
             save(finBillApplication);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
@@ -2215,6 +2225,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean companyToDivisionOperateQK(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         FinBillApplication finBillApplication = fetchBySid(bv.getBusinessSid());
+        if (finBillApplication.getIsLQOrigInvoice().equals("否")){
+            ResultBean resultBean = completeQK(bv);
+            return resultBean;
+        }
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
         //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
         bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java
index 2ece976e25..ed083af96b 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java
@@ -85,4 +85,9 @@ public class AdvanceInvoiceDto implements Dto {
     private String modelName; // 车型名称
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+
+    @ApiModelProperty("开票总金额")
+    private String invoiceMoneyTotal;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
index 91dcec2eff..00632404b1 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
@@ -38,12 +38,14 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String openTickSid;
     @ApiModelProperty("默认开票名称")
     private String openTickName;
-    @ApiModelProperty("单台开票价")
-    private String invoiceMoney;
     @ApiModelProperty("选择车辆列表")
     private List<AppCarListVo> vinList  = new ArrayList<>();
+    @ApiModelProperty("单台开票价")
+    private String invoiceMoney;
     @ApiModelProperty("欠款总金额")
     private String invoiceTotal;
+    @ApiModelProperty("开票总金额")
+    private String invoiceMoneyTotal;
     @ApiModelProperty("回款日期")
     private String collectionDate;
     @ApiModelProperty("欠款原因key")
@@ -88,4 +90,6 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String modelName;
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
index 6afa26f681..8ecce42a3a 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
@@ -325,6 +325,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
         vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
+        vo.setInvoiceMoneyTotal(finBillApplicationDetailsVo.getTotalBillMoney());
         vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
         vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
         vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
@@ -340,6 +341,16 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
         vo.setModelName(finBillApplicationDetailsVo.getModelName());
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        String reasonValue = vo.getReasonValue();
+        String remarks = vo.getRemarks();
+        String reasonRemarks = "";
+        if (StringUtils.isNotBlank(remarks)){
+            reasonRemarks = reasonValue + " \n" + remarks;
+        }else {
+            reasonRemarks = reasonValue;
+        }
+        vo.setReasonRemarks(reasonRemarks);
+        vo.setReason(finBillApplicationDetailsVo.getReason());
         //车辆信息
         List<AppCarListVo> vinListVos = new ArrayList<>();
         List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
@@ -498,6 +509,12 @@ public class AppBusAdvanceGinvoiceapplyService {
         FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
         BeanUtil.copyProperties(dto, finBillApplicationDto);
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        if (StringUtils.isBlank(dto.getQkkpBillNo())){
+            finBillApplicationDto.setQkkpBillNo(dto.getBillNo());
+        }else {
+            finBillApplicationDto.setQkkpBillNo(dto.getQkkpBillNo());
+        }
+        finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoneyTotal());
         finBillApplicationDto.setUseOrgSid(useOrgSid);
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
         finBillApplicationDto.setArrearsMoney(dto.getInvoiceTotal());