From 9403e71bf997499dff3ec62de25966a91402805a Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 9 Sep 2022 15:07:41 +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

---
 .../BusSalesOrderDepositService.java                | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 3ccde44e78..0106701376 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,6 +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());
+                    }
+                }
             }
         }
         List<AppBusSalesOrderDepositListVo> list = busDepositFictitiousService.getList(depositSid);