Browse Source

修改移动端销售订单问题

zhanglei
dimengzhe 3 years ago
parent
commit
43d971c402
  1. 18
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

18
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<BusSalesOrderMapper
private SysProUrlFeign sysProUrlFeign;
@Autowired
private MessageFeign messageFeign;
@Autowired
private BusDepositService busDepositService;
/**
* 构造查询条件
@ -983,6 +987,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
//再加回来
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid());
//根据订金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());
}
}
return rb.success().setData(resultBean.getData());
}
}

Loading…
Cancel
Save