From 43d971c4029abb98b7c009ff71457a46b61a74be Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Sep 2022 15:17:49 +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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 9838f7b6b4..68c6f06f77 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 @@ -58,6 +58,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositListVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance; @@ -76,6 +77,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDeta import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto; +import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService; import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService; import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; @@ -207,6 +209,8 @@ public class BusSalesOrderService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //再加回来 + BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid()); + //根据订金sid查询虚拟订单和订金的关联 + List 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()); + } + } return rb.success().setData(resultBean.getData()); } }