From 753c28210d3e91d4cd85600cf88bac801e62b540 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 9 Sep 2022 16:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/BusSalesOrderService.java   | 14 +++++++----
 .../BusSalesOrderDepositService.java          | 25 ++++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 25a36c37a5..301440b3c6 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -989,7 +989,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 updateFlowFiled(map);
                 //再加回来
                 BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid());
-                if("02".equals(busSalesOrderDeposit.getDepositTypeKey())){
+                if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
                     //根据订金sid查询虚拟订单和订金的关联
                     List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
                     listVos.removeAll(Collections.singleton(null));
@@ -2238,10 +2238,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if ("0".equals(busSalesOrder.getIsInsurance())) {
                 vo.setInsuranceInfo("未在公司入保" + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks());
             } else if ("1".equals(busSalesOrder.getIsInsurance())) {
-                String x = ",";
-                String x1 = "单台车保费预估金额：";
-                String x2 = "入保期数：";
-                vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName()+":" + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
+                String x = "、";
+                String x1 = "单台车保费预估金额（元）：";
+                String x2 = "公司入保期数：";
+                String info = "公司投保、保险公司名称：" + busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum();
+                if (StringUtils.isNotBlank(busSalesOrderInsurance.getRemarks())) {
+                    info = info + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks();
+                }
+                vo.setInsuranceInfo(info);
             }
         } else {
             if ("0".equals(busSalesOrder.getIsInsurance())) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
index 0106701376..2833711028 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
@@ -244,18 +244,19 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             if ("01".equals(dto.getDepositTypeKey())) {
                 //将需补交订金设置为null
                 baseMapper.updateMakeUpDeposit(depositSid);
-                //查询该订金信息的结转信息中已结转的，再加回至简易订金单的已使用订金中
-                //根据订金sid查询虚拟订单和订金的关联
-                List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
-                listVos.removeAll(Collections.singleton(null));
-                if (!listVos.isEmpty()) {
-                    for (AppBusSalesOrderDepositListVo listVo : listVos) {
-                        //查询该虚拟订金单已使用的订金值
-                        String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
-                        depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString();
-                        //更新该虚拟订单的订金值
-                        busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
-                    }
+
+            }
+            //查询该订金信息的结转信息中已结转的，再加回至简易订金单的已使用订金中
+            //根据订金sid查询虚拟订单和订金的关联
+            List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
+            listVos.removeAll(Collections.singleton(null));
+            if (!listVos.isEmpty()) {
+                for (AppBusSalesOrderDepositListVo listVo : listVos) {
+                    //查询该虚拟订金单已使用的订金值
+                    String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
+                    depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString();
+                    //更新该虚拟订单的订金值
+                    busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
                 }
             }
         }