|
|
|
@ -134,8 +134,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
@Autowired |
|
|
|
private SysUserFeign sysUserFeign; |
|
|
|
@Autowired |
|
|
|
private FlowableFeign flowableFeign; |
|
|
|
@Autowired |
|
|
|
private FlowTaskFeign flowTaskFeign; |
|
|
|
@Autowired |
|
|
|
private SysFormLinkFeign sysFormLinkFeign; |
|
|
|
@Autowired |
|
|
|
private BaseVehmodelConfigFeign baseVehmodelConfigFeign; |
|
|
|
@ -405,9 +408,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
//判断补交金额和订金合计-本次结转金额
|
|
|
|
String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit(); |
|
|
|
if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) { |
|
|
|
return rb.setMsg("订金信息中需补交订金数值计算错误"); |
|
|
|
if(StringUtils.isNotBlank(makeUpDeposit)){ |
|
|
|
if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) { |
|
|
|
return rb.setMsg("订金信息中需补交订金数值计算错误"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
@ -500,32 +506,32 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
baseMapper.insert(busSalesOrder); |
|
|
|
String sid = busSalesOrder.getSid(); |
|
|
|
//主车车型信息保存
|
|
|
|
busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid()); |
|
|
|
busSalesOrderModelService.saveModel(busSalesOrderModelDto, sid); |
|
|
|
if ("1".equals(dto.getType())) { |
|
|
|
//现车车辆信息
|
|
|
|
busSalesOrderVehicleService.saveVehicle(list, dto.getSid()); |
|
|
|
busSalesOrderVehicleService.saveVehicle(list, sid); |
|
|
|
} else if ("2".equals(dto.getType())) { |
|
|
|
//采购订单信息
|
|
|
|
busSalesVehicleOrderService.saveOrder(vehicleList, dto.getSid()); |
|
|
|
busSalesVehicleOrderService.saveOrder(vehicleList, sid); |
|
|
|
} |
|
|
|
//是否含有上装信息
|
|
|
|
String isTop = dto.getIsTop(); |
|
|
|
if ("1".equals(isTop)) { |
|
|
|
busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, dto.getSid()); |
|
|
|
busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, sid); |
|
|
|
} |
|
|
|
//价格信息
|
|
|
|
busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, dto.getSid()); |
|
|
|
busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, sid); |
|
|
|
//主车优惠明细
|
|
|
|
busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, dto.getSid()); |
|
|
|
busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, sid); |
|
|
|
//是否有保险说明
|
|
|
|
String isInsurance = dto.getIsInsurance(); |
|
|
|
if ("1".equals(isInsurance)) { |
|
|
|
busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, dto.getSid()); |
|
|
|
busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, sid); |
|
|
|
} |
|
|
|
busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, dto.getSid()); |
|
|
|
String depositSid = busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, sid); |
|
|
|
if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) { |
|
|
|
//现交订金
|
|
|
|
busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, dto.getSid()); |
|
|
|
busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, depositSid); |
|
|
|
} |
|
|
|
return sid; |
|
|
|
|
|
|
|
@ -731,6 +737,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
nodeState = ProcessStateEnum.FINISHED.getStateName(); |
|
|
|
taskDefKey = "Event_end"; |
|
|
|
map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode()); |
|
|
|
//更新销售订单的状态为已通过的状态:审批通过1
|
|
|
|
//ToDo:
|
|
|
|
updateStateByBusinessSid(1,variables.get("businessSid").toString()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
map.put("nodeState", nodeState); |
|
|
|
@ -739,6 +751,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 更新销售订单的状态 |
|
|
|
* @param state 状态，审批通过1，不通过2 |
|
|
|
* @param businessSid |
|
|
|
*/ |
|
|
|
private void updateStateByBusinessSid(int state, String businessSid) { |
|
|
|
baseMapper.updateStateByBusinessSid(state,businessSid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean reject(BusSalesOrderFlowDto dto) { |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(dto, flowTaskVo); |
|
|
|
@ -763,6 +784,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
public ResultBean breakProcess(BusSalesOrderFlowDto dto) { |
|
|
|
FlowTaskVo flowTaskVo = new FlowTaskVo(); |
|
|
|
BeanUtil.copyProperties(dto, flowTaskVo); |
|
|
|
//查询是否是最后一步
|
|
|
|
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(dto.getInstanceId()); |
|
|
|
if (listResultBean.getData().size() == 0) { |
|
|
|
//更新销售订单的状态为不通过
|
|
|
|
updateStateByBusinessSid(2,dto.getBusinessSid()); |
|
|
|
} |
|
|
|
ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
return resultBean; |
|
|
|
@ -1185,10 +1212,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
busSalesOrderInsuranceService.deleteByOrderSid(sid); |
|
|
|
} |
|
|
|
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid); |
|
|
|
busSalesOrderDepositService.deleteByOrderSid(sid); |
|
|
|
if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) { |
|
|
|
busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid()); |
|
|
|
if(busSalesOrderDeposit != null){ |
|
|
|
busSalesOrderDepositService.deleteByOrderSid(sid); |
|
|
|
if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) { |
|
|
|
busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return rb.success().setMsg("删除成功"); |
|
|
|
} |
|
|
|
|
Zhao Qiqi
3 years ago