BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整

pull/1121/head
梁宇奇 2025-07-15 18:22:26 +08:00
parent 6b443fb998
commit e51f3ae588
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java
View File

@ -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();
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/account/StoreRechargeReqVO.java
View File

@ -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;
}