From e51f3ae5883433ff4f54b8e9316171ede9562124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Tue, 15 Jul 2025 18:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/xkt/StoreOrderController.java | 6 ++---- .../web/controller/xkt/vo/account/StoreRechargeReqVO.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java index ce1775b0d..77f4b67b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java @@ -224,10 +224,8 @@ public class StoreOrderController extends XktBaseController { @ApiOperation("确认收货") @PostMapping("receipt") public R receipt(@Valid @RequestBody StoreOrderReceiptReqVO vo) { - if (!SecurityUtils.isAdmin()) { - //仅档口可操作 - storeOrderService.checkOrderStore(vo.getStoreOrderId(), SecurityUtils.getStoreId()); - } + //仅本人可操作 + storeOrderService.checkOrderUser(vo.getStoreOrderId(), SecurityUtils.getUserId()); storeOrderService.receiptOrder(vo.getStoreOrderId(), SecurityUtils.getUserId()); return success(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java index ad2491aaa..0f6d1e332 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java @@ -22,6 +22,6 @@ public class StoreRechargeReqVO { @ApiModelProperty(value = "支付渠道[1:支付宝]", required = true) private Integer payChannel; @NotNull(message = "支付来源不能为空") - @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站]", required = true) + @ApiModelProperty(value = "支付来源[1:电脑网站 2:手机网站 3:APP]", required = true) private Integer payPage; }