yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改移动端销售订单问题

master
dimengzhe 3 years ago
parent
43d971c402
commit
05f4cb6946
1 changed files with 17 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

32
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -989,16 +989,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
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());
if("02".equals(busSalesOrderDeposit.getDepositTypeKey())){
//根据订金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());
@ -2220,12 +2222,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);
if (busSalesOrderInsurance != null) {
if ("0".equals(busSalesOrder.getIsInsurance())) {
vo.setInsuranceInfo("未在公司入保，" + busSalesOrderInsurance.getRemarks());
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 x1 = "单台车保费预估金额：";
String x2 = "入保期数：";
vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName()+":" + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
}
} else {
if ("0".equals(busSalesOrder.getIsInsurance())) {
@ -2277,7 +2279,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
if (StringUtils.isNotBlank(topInfo.getRemarks())) {
topInfo.setTopBean(topInfo.getTopBean() + "\n" + "备注："+topInfo.getRemarks());
topInfo.setTopBean(topInfo.getTopBean() + "\n\n" + "备注：" + topInfo.getRemarks());
}
vo.setTopInfo(topInfo);
}

Write Preview
Loading…
Cancel
Save