caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 核销订单如果订单不存在则抛出异常

Browse Source
This commit is contained in:
Chopper711 2024-03-28 15:36:56 +08:00
parent cdb8e851a8
commit 794fa63302
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -310,7 +310,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
Order order = OperationalJudgment.judgment(this.getBySn(orderSn)); Order order = OperationalJudgment.judgment(this.getBySn(orderSn));
//如果订单促销类型不为空&&订单是拼团订单，并且订单未成团，则抛出异常 //如果订单促销类型不为空&&订单是拼团订单，并且订单未成团，则抛出异常
if (OrderPromotionTypeEnum.PINTUAN.name().equals(order.getOrderPromotionType()) if (OrderPromotionTypeEnum.PINTUAN.name().equals(order.getOrderPromotionType())
&& !CharSequenceUtil.equalsAny(order.getOrderStatus(), OrderStatusEnum.TAKE.name(), OrderStatusEnum.UNDELIVERED.name(), OrderStatusEnum.STAY_PICKED_UP.name())) { && !CharSequenceUtil.equalsAny(order.getOrderStatus(), OrderStatusEnum.TAKE.name(), OrderStatusEnum.UNDELIVERED.name(),
OrderStatusEnum.STAY_PICKED_UP.name())) {
throw new ServiceException(ResultCode.ORDER_CAN_NOT_CANCEL); throw new ServiceException(ResultCode.ORDER_CAN_NOT_CANCEL);
} }
if (CharSequenceUtil.equalsAny(order.getOrderStatus(), if (CharSequenceUtil.equalsAny(order.getOrderStatus(),
@ -533,10 +534,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
@Override @Override
public Order getOrderByVerificationCode(String verificationCode) { public Order getOrderByVerificationCode(String verificationCode) {
String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId(); String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
return this.getOne(new LambdaQueryWrapper<Order>() Order order = this.getOne(new LambdaQueryWrapper<Order>()
.in(Order::getOrderStatus, OrderStatusEnum.TAKE.name(), OrderStatusEnum.STAY_PICKED_UP.name()) .in(Order::getOrderStatus, OrderStatusEnum.TAKE.name(), OrderStatusEnum.STAY_PICKED_UP.name())
.eq(Order::getStoreId, storeId) .eq(Order::getStoreId, storeId)
.eq(Order::getVerificationCode, verificationCode)); .eq(Order::getVerificationCode, verificationCode));
if (order == null) {
throw new ServiceException(ResultCode.ORDER_TAKE_ERROR);
}
return order;
} }
@Override @Override
@ -851,7 +856,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
orderPackageItem.setGoodsName(orderItem.getGoodsName()); orderPackageItem.setGoodsName(orderItem.getGoodsName());
orderPackageItem.setThumbnail(orderItem.getImage()); orderPackageItem.setThumbnail(orderItem.getImage());
orderPackageItemService.save(orderPackageItem); orderPackageItemService.save(orderPackageItem);
OrderLog orderLog = new OrderLog(orderSn, UserContext.getCurrentUser().getId(), UserContext.getCurrentUser().getRole().getRole(), UserContext.getCurrentUser().getUsername(), "订单 [ " + orderSn + " ]商品 [ " + orderItem.getGoodsName() + " ]发货，发货数量: [ " + partDeliveryDTO.getDeliveryNum() + " ]，发货单号[ " + invoiceNumber + " ]"); OrderLog orderLog = new OrderLog(orderSn, UserContext.getCurrentUser().getId(),
UserContext.getCurrentUser().getRole().getRole(), UserContext.getCurrentUser().getUsername(), "订单 [ " + orderSn + " ]商品" +
" [ " + orderItem.getGoodsName() + " ]发货，发货数量: [ " + partDeliveryDTO.getDeliveryNum() + " ]，发货单号[ " + invoiceNumber + " ]");
orderLogList.add(orderLog); orderLogList.add(orderLog);
} }
} }
@ -1149,6 +1156,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
/** /**
* 根据订单设置修改订单投诉状态 * 根据订单设置修改订单投诉状态
*
* @param orderSn * @param orderSn
*/ */
private void updateOrderComplainStatus(String orderSn) { private void updateOrderComplainStatus(String orderSn) {