Skip to content

J
jiedao-api-boot-master
Commit edef6c19 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'order-update' into dev

parents 09c113ee 1c190955
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ edef6c19
...@@ -393,9 +393,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -393,9 +393,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 插入订单商品项 // 插入订单商品项
orderBusinessService.costCalculation(creator, orderBusinessService.costCalculation(creator,
order, createReqVO.getConsignorId(), order, createReqVO.getConsignorId(),
createReqVO.getConsigneeId(), Objects.isNull(createReqVO.getConsigneeId()) ? 0L : createReqVO.getConsigneeId(),
createReqVO.getConsignorContactsId(), createReqVO.getConsignorContactsId(),
createReqVO.getConsigneeContactsId(), Objects.isNull(createReqVO.getConsigneeContactsId()) ? 0L : createReqVO.getConsigneeContactsId(),
orderItemDOList, type); orderItemDOList, type);
...@@ -592,7 +592,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -592,7 +592,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (order.getIsCargoControl()) { if (order.getIsCargoControl()) {
order.setIsLimitUpdateConsignee(Boolean.TRUE); order.setIsLimitUpdateConsignee(Boolean.TRUE);
}else { } else {
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
} }
orderConsigneeDO = new OrderConsigneeDO(); orderConsigneeDO = new OrderConsigneeDO();
...@@ -674,7 +674,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -674,7 +674,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
} }
orderConsigneeService.save(orderConsigneeDO); orderConsigneeService.save(orderConsigneeDO);
}else { } else {
// 控货订单没有收货人则不限制修改收货人 // 控货订单没有收货人则不限制修改收货人
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
} }
...@@ -808,7 +808,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -808,7 +808,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (order.getIsCargoControl()) { if (order.getIsCargoControl()) {
order.setIsLimitUpdateConsignee(Boolean.TRUE); order.setIsLimitUpdateConsignee(Boolean.TRUE);
}else { } else {
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
} }
orderConsigneeDO = new OrderConsigneeDO(); orderConsigneeDO = new OrderConsigneeDO();
...@@ -920,7 +920,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -920,7 +920,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (StringUtils.isNotBlank(orderConsigneeDO.getPhone())) { if (StringUtils.isNotBlank(orderConsigneeDO.getPhone())) {
orderConsigneeService.save(orderConsigneeDO); orderConsigneeService.save(orderConsigneeDO);
} }
}else { } else {
// 控货订单没有收货人则不限制修改收货人 // 控货订单没有收货人则不限制修改收货人
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
} }
...@@ -1373,8 +1373,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1373,8 +1373,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
String updater = String.valueOf(loginUser != null ? loginUser.getId() : null); String updater = String.valueOf(loginUser != null ? loginUser.getId() : null);
// 插入订单商品项 // 插入订单商品项
orderBusinessService.costCalculation(updater, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(updater, orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, type); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, type);
} }
private void handleException(Long orderId, OrderDO orderDO, List<OrderChangePriceParam> channelPriceParams, int type) { private void handleException(Long orderId, OrderDO orderDO, List<OrderChangePriceParam> channelPriceParams, int type) {
...@@ -1410,8 +1410,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1410,8 +1410,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
String updater = String.valueOf(loginUser != null ? loginUser.getId() : null); String updater = String.valueOf(loginUser != null ? loginUser.getId() : null);
// 插入订单商品项 // 插入订单商品项
orderBusinessService.costCalculation(updater, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(updater, orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, type); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, type);
// orderMapper.updateById(orderDO); // orderMapper.updateById(orderDO);
} }
...@@ -1495,7 +1495,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1495,7 +1495,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.isNull(oldOrderDO)) { if (Objects.isNull(oldOrderDO)) {
throw exception(ORDER_NOT_EXISTS); throw exception(ORDER_NOT_EXISTS);
} }
if (oldOrderDO.getOrderNo().contains("DRAFT")){ if (oldOrderDO.getOrderNo().contains("DRAFT")) {
// 原单为草稿订单 // 原单为草稿订单
updateObj.setIsChargeDraft(true); updateObj.setIsChargeDraft(true);
} }
...@@ -1665,8 +1665,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1665,8 +1665,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 插入订单商品项 // 插入订单商品项
orderBusinessService.costCalculation(updater, updateObj, updateReqVO.getConsignorId(), updateReqVO.getConsigneeId(), orderBusinessService.costCalculation(updater, updateObj, updateReqVO.getConsignorId(), Objects.isNull(updateReqVO.getConsigneeId()) ? 0L : updateReqVO.getConsigneeId(),
updateReqVO.getConsignorContactsId(), updateReqVO.getConsigneeContactsId(), orderItemDOList, type); updateReqVO.getConsignorContactsId(), Objects.isNull(updateReqVO.getConsigneeContactsId()) ? 0L : updateReqVO.getConsigneeContactsId(), orderItemDOList, type);
// 如果报价单id不为空，则表示此订单关联报价单 // 如果报价单id不为空，则表示此订单关联报价单
if (Objects.nonNull(updateReqVO.getOfferId()) && updateReqVO.getOfferId() > 0L) { if (Objects.nonNull(updateReqVO.getOfferId()) && updateReqVO.getOfferId() > 0L) {
...@@ -1841,7 +1841,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1841,7 +1841,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (vo.getIsCargoControl() && vo.getHasConsignee() != noConsignee) { if (vo.getIsCargoControl() && vo.getHasConsignee() != noConsignee) {
ApplyInfoVO infoVO = new ApplyInfoVO(); ApplyInfoVO infoVO = new ApplyInfoVO();
infoVO.setName("控货订单发货人控货无收货人"); infoVO.setName("控货订单发货人控货无收货人");
infoVO.setOrgValue(vo.getHasConsignee()? "是" : "否"); infoVO.setOrgValue(vo.getHasConsignee() ? "是" : "否");
infoVO.setNewValue(noConsignee ? "是" : "否"); infoVO.setNewValue(noConsignee ? "是" : "否");
vo.setHasConsignee(noConsignee); vo.setHasConsignee(noConsignee);
applyInfoList.add(infoVO); applyInfoList.add(infoVO);
...@@ -1876,9 +1876,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1876,9 +1876,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.nonNull(consigneeContactsDO)) { if (Objects.nonNull(consigneeContactsDO)) {
this.compareConsigneeInfo(updateReqVO, consigneeContactsDO, orderConsigneeBackVO, applyInfoList, vo, dictDataRespDTO); this.compareConsigneeInfo(updateReqVO, consigneeContactsDO, orderConsigneeBackVO, applyInfoList, vo, dictDataRespDTO);
} }
}else { } else {
// 控货订单发货人设置为控货无收货人，这里需要处理掉订单的收货人信息 // 控货订单发货人设置为控货无收货人，这里需要处理掉订单的收货人信息
if (Objects.nonNull(orderConsigneeBackVO)){ if (Objects.nonNull(orderConsigneeBackVO)) {
ApplyInfoVO infoVO = new ApplyInfoVO(); ApplyInfoVO infoVO = new ApplyInfoVO();
infoVO.setName("控货订单发货人设置为控货无收货人，清除订单收货人信息/Set the shipper of the controlled goods order to no consignee, and clear the consignee information of the order"); infoVO.setName("控货订单发货人设置为控货无收货人，清除订单收货人信息/Set the shipper of the controlled goods order to no consignee, and clear the consignee information of the order");
applyInfoList.add(infoVO); applyInfoList.add(infoVO);
...@@ -1930,7 +1930,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1930,7 +1930,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderDO.setPackageType(updateObj.getPackageType()); orderDO.setPackageType(updateObj.getPackageType());
// TODO 这里计算费用还是走的之前订单信息参数业务，如果有错误提示，那么捕获错误，允许提交审批 // TODO 这里计算费用还是走的之前订单信息参数业务，如果有错误提示，那么捕获错误，允许提交审批
try { try {
orderBusinessService.costCalculation(updater, orderDO, orderConsignorBackVO.getCustomerId(), orderConsigneeBackVO.getCustomerId(), orderConsignorBackVO.getCustomerContactsId(), orderConsigneeBackVO.getCustomerContactsId(), orderBusinessService.costCalculation(updater, orderDO, orderConsignorBackVO.getCustomerId(), Objects.isNull(orderConsigneeBackVO) ? 0L : orderConsigneeBackVO.getCustomerId(), orderConsignorBackVO.getCustomerContactsId(), Objects.isNull(orderConsigneeBackVO) ? 0L : orderConsigneeBackVO.getCustomerContactsId(),
orderItemDOList, 8); orderItemDOList, 8);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage()); log.error(e.getMessage());
...@@ -3022,7 +3022,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3022,7 +3022,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (updateObj.getIsCargoControl()) { if (updateObj.getIsCargoControl()) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE); updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
}else { } else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE); updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
} }
if (Objects.isNull(orderConsigneeDO)) { if (Objects.isNull(orderConsigneeDO)) {
...@@ -3090,9 +3090,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3090,9 +3090,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
} }
orderConsigneeService.saveOrUpdate(orderConsigneeDO); orderConsigneeService.saveOrUpdate(orderConsigneeDO);
}else { } else {
// 如果控货订单发货人设置了控货无收货人，则需要删除订单已有收货人 // 如果控货订单发货人设置了控货无收货人，则需要删除订单已有收货人
if (Objects.nonNull(orderConsigneeDO)){ if (Objects.nonNull(orderConsigneeDO)) {
orderConsigneeService.removeById(orderConsigneeDO.getId()); orderConsigneeService.removeById(orderConsigneeDO.getId());
orderConsigneeDO = null; orderConsigneeDO = null;
} }
...@@ -3248,7 +3248,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3248,7 +3248,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (updateObj.getIsCargoControl()) { if (updateObj.getIsCargoControl()) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE); updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
}else { } else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE); updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
} }
if (Objects.isNull(orderConsigneeDO)) { if (Objects.isNull(orderConsigneeDO)) {
...@@ -3348,9 +3348,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3348,9 +3348,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (StringUtils.isNotBlank(orderConsigneeDO.getPhone())) { if (StringUtils.isNotBlank(orderConsigneeDO.getPhone())) {
orderConsigneeService.saveOrUpdate(orderConsigneeDO); orderConsigneeService.saveOrUpdate(orderConsigneeDO);
} }
}else { } else {
// 如果控货订单发货人设置了控货无收货人，则需要删除订单已有收货人 // 如果控货订单发货人设置了控货无收货人，则需要删除订单已有收货人
if (Objects.nonNull(orderConsigneeDO)){ if (Objects.nonNull(orderConsigneeDO)) {
orderConsigneeService.removeById(orderConsigneeDO.getId()); orderConsigneeService.removeById(orderConsigneeDO.getId());
orderConsigneeDO = null; orderConsigneeDO = null;
} }
...@@ -3422,7 +3422,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3422,7 +3422,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// } // }
// } // }
orderBusinessService.costCalculation(String.valueOf(SecurityFrameworkUtils.getLoginUserId()), orderDO, orderConsignorDO.getCustomerId(), orderBusinessService.costCalculation(String.valueOf(SecurityFrameworkUtils.getLoginUserId()), orderDO, orderConsignorDO.getCustomerId(),
orderConsigneeDO.getCustomerId(), orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(), orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(),
orderItemDOList, 3); orderItemDOList, 3);
return orderDO; return orderDO;
} }
...@@ -3524,8 +3524,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3524,8 +3524,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 合单时重新判定订单重泡货类型 // 合单时重新判定订单重泡货类型
mergeOrderJudgingHeavyFoamGoods(orderDO, orderItemDOList, consignorDO, consigneeDO); mergeOrderJudgingHeavyFoamGoods(orderDO, orderItemDOList, consignorDO, consigneeDO);
orderBusinessService.costCalculation(String.valueOf(SecurityFrameworkUtils.getLoginUserId()), orderDO, consignorDO.getCustomerId(), consigneeDO.getCustomerId(), orderBusinessService.costCalculation(String.valueOf(SecurityFrameworkUtils.getLoginUserId()), orderDO, consignorDO.getCustomerId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerId(),
consignorDO.getCustomerContactsId(), consigneeDO.getCustomerContactsId(), orderItemDOList, 4); consignorDO.getCustomerContactsId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerContactsId(), orderItemDOList, 4);
boolean isPayAdvanceException = this.addOrderReceivable(orderDO, 1); boolean isPayAdvanceException = this.addOrderReceivable(orderDO, 1);
// if (isPayAdvanceException) { // if (isPayAdvanceException) {
// List<OrderExceptionDO> orderExceptionDOList = orderExceptionService.getOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderDO.getOrderId(), null, OrderExceptionEnum.ORDER_PAY_EXCEPTION.getKey()); // List<OrderExceptionDO> orderExceptionDOList = orderExceptionService.getOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderDO.getOrderId(), null, OrderExceptionEnum.ORDER_PAY_EXCEPTION.getKey());
...@@ -3812,8 +3812,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3812,8 +3812,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).last("limit 1")); OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).last("limit 1")); OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).last("limit 1"));
orderBusinessService.costCalculation(String.valueOf(SecurityFrameworkUtils.getLoginUserId()), orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(String.valueOf(SecurityFrameworkUtils.getLoginUserId()), orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 5); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 5);
// 更新特需 // 更新特需
this.saveOrUpdateSpecialNeed(orderDO.getOrderId(), orderDO.getPackageType(), orderDO.getPackageRemarks(), creator, now); this.saveOrUpdateSpecialNeed(orderDO.getOrderId(), orderDO.getPackageType(), orderDO.getPackageRemarks(), creator, now);
// 对拆出的新订单，插入拆单成功，待入仓日志 // 对拆出的新订单，插入拆单成功，待入仓日志
...@@ -5459,11 +5459,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5459,11 +5459,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
OrderConsigneeDO consigneeDO = OrderConsigneeConvert.INSTANCE.convert(consigneeVO); OrderConsigneeDO consigneeDO = OrderConsigneeConvert.INSTANCE.convert(consigneeVO);
// 控货订单发货人无收货人属性变动，需要清空订单收货人信息 // 控货订单发货人无收货人属性变动，需要清空订单收货人信息
Boolean isLimitUpdateConsignee = Boolean.FALSE; Boolean isLimitUpdateConsignee = Boolean.FALSE;
if (orderBackVO.getIsChargeNoConsignee()){ if (orderBackVO.getIsChargeNoConsignee()) {
orderConsigneeService.removeById(consigneeDO.getId()); orderConsigneeService.removeById(consigneeDO.getId());
}else { } else {
orderConsigneeService.updateById(consigneeDO); orderConsigneeService.updateById(consigneeDO);
if (orderBackVO.getIsCargoControl()){ if (orderBackVO.getIsCargoControl()) {
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
isLimitUpdateConsignee = Boolean.TRUE; isLimitUpdateConsignee = Boolean.TRUE;
} }
...@@ -5598,8 +5598,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5598,8 +5598,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
it.setSplitCustomPriceType(false); it.setSplitCustomPriceType(false);
}).collect(Collectors.toList()); }).collect(Collectors.toList());
// 强制重新定价, 则需要将特价属性都重置 // 强制重新定价, 则需要将特价属性都重置
orderBusinessService.costCalculation(String.valueOf(userId), orderDO, consignorDO.getCustomerId(), consigneeDO.getCustomerId(), orderBusinessService.costCalculation(String.valueOf(userId), orderDO, consignorDO.getCustomerId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerId(),
consignorDO.getCustomerContactsId(), consigneeDO.getCustomerContactsId(), orderItemDOList, 10); consignorDO.getCustomerContactsId(), Objects.isNull(consigneeDO) ? 0L : consigneeDO.getCustomerContactsId(), orderItemDOList, 10);
} }
orderBusinessService.addOrderTimeLog(orderDO.getStatus(), orderDO, 7, now, now); orderBusinessService.addOrderTimeLog(orderDO.getStatus(), orderDO, 7, now, now);
// 空运相关订单处理业务 // 空运相关订单处理业务
...@@ -5754,8 +5754,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5754,8 +5754,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
String userId = String.valueOf(SecurityFrameworkUtils.getLoginUserId()); String userId = String.valueOf(SecurityFrameworkUtils.getLoginUserId());
OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1")); OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 7); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 7);
} }
private String getAuditResult(Integer result, Integer type) { private String getAuditResult(Integer result, Integer type) {
...@@ -5970,7 +5970,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5970,7 +5970,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
// 2024-08-08 当订单入仓完成，需要校验订单业绩归属客户方，当前是否在公海，是则业绩归属客户经理为空，否不需要修改 // 2024-08-08 当订单入仓完成，需要校验订单业绩归属客户方，当前是否在公海，是则业绩归属客户经理为空，否不需要修改
CustomerDO customerDO = customerService.getCustomer(orderDO.getCustomerId()); CustomerDO customerDO = customerService.getCustomer(orderDO.getCustomerId());
if (Objects.nonNull(customerDO) && customerDO.getIsInOpenSea() && Objects.nonNull(customerDO.getEnterOpenSeaTime())){ if (Objects.nonNull(customerDO) && customerDO.getIsInOpenSea() && Objects.nonNull(customerDO.getEnterOpenSeaTime())) {
orderDO.setSalesmanId(0L); orderDO.setSalesmanId(0L);
orderDO.setDeptId(0L); orderDO.setDeptId(0L);
orderDO.setIsInOpenSea(customerDO.getIsInOpenSea()); orderDO.setIsInOpenSea(customerDO.getIsInOpenSea());
...@@ -5979,9 +5979,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -5979,9 +5979,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderBusinessService.costCalculation(userId, orderBusinessService.costCalculation(userId,
orderDO, orderDO,
orderConsignorDO.getCustomerId(), orderConsignorDO.getCustomerId(),
orderConsigneeDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsignorDO.getCustomerContactsId(),
orderConsigneeDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(),
orderItemDOList, 15); orderItemDOList, 15);
} }
...@@ -6002,9 +6002,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -6002,9 +6002,9 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderBusinessService.costCalculation(userId, orderBusinessService.costCalculation(userId,
orderDO, orderDO,
orderConsignorDO.getCustomerId(), orderConsignorDO.getCustomerId(),
orderConsigneeDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsignorDO.getCustomerContactsId(),
orderConsigneeDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(),
orderItemDOList, orderItemDOList,
10); 10);
} }
...@@ -6029,8 +6029,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -6029,8 +6029,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2); // addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
// } // }
// } // }
orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 16); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 16);
} }
} }
...@@ -6054,8 +6054,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -6054,8 +6054,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2); // addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
// } // }
// } // }
orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 17); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 17);
} }
} }
...@@ -6084,8 +6084,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -6084,8 +6084,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1")); OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
List<OrderItemDO> orderItemDOList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderDO.getOrderId())); List<OrderItemDO> orderItemDOList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItemDO>().eq(OrderItemDO::getOrderId, orderDO.getOrderId()));
orderBusinessService.costCalculation(userId.toString(), orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(userId.toString(), orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, isResetPrice ? 20 : 8); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, isResetPrice ? 20 : 8);
// TODO 此处是否需要更新操作日志 // TODO 此处是否需要更新操作日志
} }
// } // }
...@@ -6128,8 +6128,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -6128,8 +6128,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
String userId = String.valueOf(SecurityFrameworkUtils.getLoginUserId()); String userId = String.valueOf(SecurityFrameworkUtils.getLoginUserId());
OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1")); OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(), orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerId(),
orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 50); orderConsignorDO.getCustomerContactsId(), Objects.isNull(orderConsigneeDO) ? 0L : orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 50);
orderBusinessService.addOrderOperateLog(orderDO.getOrderId(), "有活动更新订单计价", null); orderBusinessService.addOrderOperateLog(orderDO.getOrderId(), "有活动更新订单计价", null);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment