|
|
@ -989,6 +989,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
updateFlowFiled(map); |
|
|
|
//再加回来
|
|
|
|
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(query.getBusinessSid()); |
|
|
|
if("02".equals(busSalesOrderDeposit.getDepositTypeKey())){ |
|
|
|
//根据订金sid查询虚拟订单和订金的关联
|
|
|
|
List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid()); |
|
|
|
listVos.removeAll(Collections.singleton(null)); |
|
|
@ -1001,6 +1002,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
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); |
|
|
|
} |
|
|
|