|
|
|
@ -954,8 +954,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
public BusSalesOrderPowerVo isHavePower(String sid) { |
|
|
|
BusSalesOrder busSalesOrder = fetchBySid(sid); |
|
|
|
BusSalesOrderPowerVo busSalesOrderPowerVo = new BusSalesOrderPowerVo(); |
|
|
|
boolean isHavePower = false; |
|
|
|
boolean isPower = false; |
|
|
|
boolean isHavePower = false;//默认不超权限
|
|
|
|
boolean isPower = false;//默认不超权限
|
|
|
|
//总指导价-总成交价-总优惠包的价值
|
|
|
|
BigDecimal bigDecimalOne = new BigDecimal("0"); |
|
|
|
//初始化总促销金额
|
|
|
|
@ -1043,6 +1043,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} else { |
|
|
|
isHavePower = false; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
isHavePower = true; |
|
|
|
} |
|
|
|
//总经理的角色sid
|
|
|
|
// roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
|
|
|
|
@ -1070,6 +1072,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} else { |
|
|
|
isPower = false; |
|
|
|
} |
|
|
|
}else{ |
|
|
|
isPower = true; |
|
|
|
} |
|
|
|
busSalesOrderPowerVo.setIsPower(isPower); |
|
|
|
busSalesOrderPowerVo.setIsHavePower(isHavePower); |
|
|
|
@ -2488,6 +2492,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//验证总订金是否正确
|
|
|
|
//结转金额是否超过订金合计、需补交金额是否是负数
|
|
|
|
BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid); |
|
|
|
BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(sid); |
|
|
|
//验证单台订金是否大于单台整体成交价
|
|
|
|
if (busSalesOrderDeposit.getDeposit() != null) { |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderPriceDetailsVo.getSingleFinalPrice())) { |
|
|
|
if(busSalesOrderDeposit.getDeposit().compareTo(new BigDecimal(busSalesOrderPriceDetailsVo.getSingleFinalPrice()))>0){ |
|
|
|
return rb.setMsg("单台订金不允许大于单台整体成交价"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if (busSalesOrderDeposit.getMakeUpDeposit() != null) { |
|
|
|
if (busSalesOrderDeposit.getMakeUpDeposit().compareTo(new BigDecimal("0")) < 0) { |
|
|
|
return rb.setMsg("订金信息存在错误，请检查"); |
|
|
|
@ -2779,8 +2792,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
vo.setInsuranceState(StringUtils.isNotBlank(busSalesOrder.getIsInsurance())); |
|
|
|
vo.setRemarksState(StringUtils.isNotBlank(busSalesOrder.getNotes())); |
|
|
|
String imagesFile = vo.getImagesFile(); |
|
|
|
if(StringUtils.isNotBlank(imagesFile)){ |
|
|
|
if (StringUtils.isNotBlank(imagesFile)) { |
|
|
|
List<String> imagess = Arrays.asList(imagesFile); |
|
|
|
imagess.removeAll(Collections.singleton(null)); |
|
|
|
if (!imagess.isEmpty()) { |
|
|
|
for (int i = 0; i < imagess.size(); i++) { |
|
|
|
if (!imagess.get(i).contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
imagess.set(i, fileUploadComponent.getUrlPrefix() + imagess.get(i)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setImages(imagess); |
|
|
|
} |
|
|
|
//根据销售部门sid查询分公司名称
|
|
|
|
ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidBySid(vo.getOrgSid()); |
|
|
|
@ -2818,12 +2840,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//若订单类型为0则为现车，为1采购订单，为2排产
|
|
|
|
if ("0".equals(modelInfo.getType())) { |
|
|
|
//查询车架号
|
|
|
|
List<String> vinList = busSalesOrderVehicleService.selectList(sid); |
|
|
|
// List<String> vinList = busSalesOrderVehicleService.selectList(sid);
|
|
|
|
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid); |
|
|
|
List<String> vinList = vinLists.stream().map(v->v.getVinNo()).collect(Collectors.toList()); |
|
|
|
modelInfo.setVinList(vinList); |
|
|
|
} else { |
|
|
|
if ("1".equals(modelInfo.getType())) { |
|
|
|
//查询采购订单编号
|
|
|
|
List<String> stringList = busSalesVehicleOrderService.selectList(sid); |
|
|
|
// List<String> stringList = busSalesVehicleOrderService.selectList(sid);
|
|
|
|
List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid); |
|
|
|
List<String> stringList = stringLists.stream().map(v->v.getLinkNo()).collect(Collectors.toList()); |
|
|
|
modelInfo.setOrderList(stringList); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -3151,6 +3177,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
bv.setTaskDefKey(busSalesOrder.get().getNodeId()); |
|
|
|
bv.setComment("重新提交"); |
|
|
|
bv.setInstanceId(dto.getProcInsId()); |
|
|
|
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid); |
|
|
|
AppOrderDetailsVo vo = resultBean.getData(); |
|
|
|
if ("现车".equals(vo.getOrderType())) { |
|
|
|
//更新已选择的车架号的状态为审批中
|
|
|
|
List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid); |
|
|
|
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery(); |
|
|
|
busMainDepositUpdateQuery.setVinSidList(list); |
|
|
|
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode()); |
|
|
|
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks()); |
|
|
|
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery); |
|
|
|
} |
|
|
|
return complete(bv); |
|
|
|
} |
|
|
|
return rb; |
|
|
|
@ -3655,7 +3692,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setImages(imagesFile); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
vo.setImages(stringList); |
|
|
|
} |
|
|
|
return rb.success().setData(vo); |
|
|
|
|
God
2 years ago