From e002af3c3ab64ccd65fbae87b3c431187f6b1eca Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 10 Mar 2025 10:48:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/order/controller/OrderController.java | 2 ++ .../bonus/material/order/service/impl/OrderServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 3573970..e2e3b38 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -11,6 +11,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.mapper.BmMessageMapper; +import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.contract.domain.BmContract; import com.bonus.material.contract.service.BmContractService; import com.bonus.material.lease.domain.DeptDto; @@ -140,6 +141,7 @@ public class OrderController extends BaseController { * 订单状态流转修改 */ @ApiOperation(value = "订单状态流转修改") + @PreventRepeatSubmit @PostMapping("/updateOrderStatus") public AjaxResult updateOrderStatus(@RequestBody OrderDetailDto orderInfoDto) { if (orderInfoDto.getOrderId() == null || StringUtils.isBlank(orderInfoDto.getOrderStatus())) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index c92a9b3..ba538cf 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -295,8 +295,8 @@ public class OrderServiceImpl implements OrderService { // 存储redis中 redisService.setCacheObject(MaterialConstants.DICT_TYPE_ORDER_PICKUP_CODE + orderInfoDto.getOrderId(), code); } - // 针对于收货操作，校验6位数取件码是否正确 - if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString())) { + // 针对于出库操作，校验6位数取件码是否正确 + if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_PENDING_SHIPMENT.getStatus().toString())) { if (StringUtils.isBlank(orderInfoDto.getPickupCode())){ throw new ServiceException("取件码不能为空"); }