BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 7580b8cf28a7d2fd64f166eb04a58ad9d1d65a79

Authored by Jarrett
1 parent f8ebdbdd

modify(mall): 自提订单核销校验订单是否是待核销状态

Inline Side-by-side
Showing 2 changed files with 4 additions and 0 deletions
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
  View file @7580b8c
... ... @@ -41,6 +41,7 @@ public interface ErrorCodeConstants {
41 41 ErrorCode ORDER_PICK_UP_FAIL_NOT_VERIFY_USER = new ErrorCode(1_011_000_036, "交易订单自提失败，原因：你没有核销该门店订单的权限");
42 42 ErrorCode ORDER_PICK_UP_FAIL_COMBINATION_NOT_SUCCESS = new ErrorCode(1_011_000_037, "交易订单自提失败，原因：商品拼团记录不是【成功】状态");
43 43 ErrorCode ORDER_CREATE_FAIL_INSUFFICIENT_USER_POINTS = new ErrorCode(1_011_000_038, "交易订单创建失败，原因：用户积分不足");
  44 + ErrorCode ORDER_PICK_UP_FAIL_STATUS_NOT_UNDELIVERED = new ErrorCode(1_011_000_039, "交易订单自提失败，订单不是【待核销】状态");
44 45  
45 46 // ========== After Sale 模块 1-011-000-100 ==========
46 47 ErrorCode AFTER_SALE_NOT_FOUND = new ErrorCode(1_011_000_100, "售后单不存在");
... ...
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @7580b8c
... ... @@ -780,6 +780,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
780 780 if (ObjUtil.notEqual(DeliveryTypeEnum.PICK_UP.getType(), order.getDeliveryType())) {
781 781 throw exception(ORDER_RECEIVE_FAIL_DELIVERY_TYPE_NOT_PICK_UP);
782 782 }
  783 + if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) {
  784 + throw exception(ORDER_PICK_UP_FAIL_STATUS_NOT_UNDELIVERED);
  785 + }
783 786 // 情况一：如果是拼团订单，则校验拼团是否成功
784 787 if (TradeOrderTypeEnum.isCombination(order.getType())) {
785 788 CombinationRecordRespDTO combinationRecord = combinationRecordApi.getCombinationRecordByOrderId(
... ...