|
|
|
@ -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,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); |
|
|
|
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)); |
|
|
|
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()); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1268,9 +1288,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
String saleOrderSid = appOrderInitQuery.getSaleOrderSid(); |
|
|
|
String intentionSid = appOrderInitQuery.getIntentionSid(); |
|
|
|
AppBusSalesOrderBillInfoVo vo = new AppBusSalesOrderBillInfoVo(); |
|
|
|
if(StringUtils.isNotBlank(saleOrderSid)){ |
|
|
|
if (StringUtils.isNotBlank(saleOrderSid)) { |
|
|
|
vo = baseMapper.getBillInfo(saleOrderSid); |
|
|
|
if(vo != null){ |
|
|
|
if (vo != null) { |
|
|
|
String affiliatedOrgSid = vo.getAffiliatedOrgSid(); |
|
|
|
if (StringUtils.isNotBlank(affiliatedOrgSid)) { |
|
|
|
vo.setAffiliatedType("1"); |
|
|
|
@ -1282,12 +1302,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
vo.setSaleOrderSid(saleOrderSid); |
|
|
|
} |
|
|
|
|
|
|
|
}else{ |
|
|
|
if(StringUtils.isNotBlank(intentionSid)){ |
|
|
|
} else { |
|
|
|
if (StringUtils.isNotBlank(intentionSid)) { |
|
|
|
//根据意向车型查询信息
|
|
|
|
ResultBean<CrmOrderVo> resultBean = crmVehicledemandFeign.selectCrmDemand(intentionSid); |
|
|
|
CrmOrderVo crmOrderVo = resultBean.getData(); |
|
|
|
BeanUtil.copyProperties(crmOrderVo,vo); |
|
|
|
BeanUtil.copyProperties(crmOrderVo, vo); |
|
|
|
vo.setIntentionSid(intentionSid); |
|
|
|
vo.setAffiliatedType("1"); |
|
|
|
|
|
|
|
@ -1550,9 +1570,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
vo.setOrderInfo(orderInfo); |
|
|
|
vo.setState(type); |
|
|
|
if(StringUtils.isNotBlank(orderInfo.getPrice())){ |
|
|
|
vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(orderInfo.getPrice())))); |
|
|
|
} |
|
|
|
vo.setPrice(orderInfo.getPrice()); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
@ -1647,15 +1665,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
orderInfo.setNowCarList(appNowCarLists); |
|
|
|
//订单选择的采购订单列表
|
|
|
|
orderInfo.setReadyCarList(appReadyCarLists); |
|
|
|
if("1".equals(busSalesOrder.getPayTypeKey())){//全款
|
|
|
|
if(StringUtils.isNotBlank(data.getPrice())){ |
|
|
|
Double doublePrice = Double.valueOf(data.getPrice()); |
|
|
|
vo.setPrice(String.valueOf((int)Math.floor(doublePrice))); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
if(StringUtils.isNotBlank(data.getManufactorSettlementPrice())){ |
|
|
|
vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(data.getManufactorSettlementPrice())))); |
|
|
|
} |
|
|
|
if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
|
|
|
|
vo.setPrice(data.getPrice()); |
|
|
|
} else { |
|
|
|
vo.setPrice(data.getManufactorSettlementPrice()); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
@ -1753,6 +1766,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid); |
|
|
|
if (busSalesOrderDeposit != null) { |
|
|
|
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()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//删除订金信息
|
|
|
|
busSalesOrderDepositService.deleteByOrderSid(sid); |
|
|
|
if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) { |
|
|
|
@ -1939,16 +1966,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
if (!isDeposit) { |
|
|
|
return rb.setMsg("请完善订金信息"); |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(busSalesOrder.getIsInsurance())){ |
|
|
|
return rb.setMsg("请完善保险信息"); |
|
|
|
}else{ |
|
|
|
if("0".equals(busSalesOrder.getIsInsurance())){ |
|
|
|
if (StringUtils.isBlank(busSalesOrder.getIsInsurance())) { |
|
|
|
return rb.setMsg("请先完善保险信息"); |
|
|
|
} else { |
|
|
|
if ("0".equals(busSalesOrder.getIsInsurance())) { |
|
|
|
BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid); |
|
|
|
if(busSalesOrderInsurance != null){ |
|
|
|
if(StringUtils.isBlank(busSalesOrderInsurance.getRemarks())){ |
|
|
|
if (busSalesOrderInsurance != null) { |
|
|
|
if (StringUtils.isBlank(busSalesOrderInsurance.getRemarks())) { |
|
|
|
return rb.setMsg("请先完善保险信息"); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
return rb.setMsg("请先完善保险信息"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2209,14 +2236,18 @@ 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 x = "、"; |
|
|
|
String x1 = "单台车保费预估金额（元）："; |
|
|
|
String x2 = "公司入保期数："; |
|
|
|
String info = "公司投保、保险公司名称：" + busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum(); |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderInsurance.getRemarks())) { |
|
|
|
info = info + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks(); |
|
|
|
} |
|
|
|
vo.setInsuranceInfo(info); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
if ("0".equals(busSalesOrder.getIsInsurance())) { |
|
|
|
vo.setInsuranceInfo("未在公司入保"); |
|
|
|
} |
|
|
|
@ -2259,12 +2290,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
List<String> stringList = Arrays.asList(topInfo.getContractPath().split(",")); |
|
|
|
if (!stringList.isEmpty()) { |
|
|
|
List<String> stringList1 = new ArrayList<>(); |
|
|
|
stringList.stream().forEach(i->{ |
|
|
|
stringList1.add(fileUploadComponent.getUrlPrefix()+i); |
|
|
|
stringList.stream().forEach(i -> { |
|
|
|
stringList1.add(fileUploadComponent.getUrlPrefix() + i); |
|
|
|
}); |
|
|
|
topInfo.setContractImages(stringList1); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(topInfo.getRemarks())) { |
|
|
|
topInfo.setTopBean(topInfo.getTopBean() + "\n\n" + "备注：" + topInfo.getRemarks()); |
|
|
|
} |
|
|
|
vo.setTopInfo(topInfo); |
|
|
|
} |
|
|
|
} |
|
|
|
|
God
3 years ago