zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' into test

pull/17/head
tangqian 2023-06-20 15:55:02 +08:00
parent 9e1a653dbe ba45dc7202
commit bccc325bda
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/RechargeOrderController.java
View File

@ -115,7 +115,7 @@ public class RechargeOrderController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得订单分页") @Operation(summary = "获得订单分页")
@PreAuthorize("@ss.hasPermission('shop:recharge-order:query','shop:recharge-order:refund')") @PreAuthorize("@ss.hasPermission('shop:recharge-order:query')")
@TenantIgnore @TenantIgnore
public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) { public CommonResult<PageResult<RechargeOrderRespVO>> getRechargeOrderPage(@Valid RechargeOrderPageReqVO pageVO) {
if (!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())) { if (!TenantContextHolder.ID_SYSTEM.equals(SecurityFrameworkUtils.getLoginUser().getTenantId())) {
@ -139,7 +139,7 @@ public class RechargeOrderController {
@GetMapping("/promoterDraw-excel") @GetMapping("/promoterDraw-excel")
@Operation(summary = "导出推广员抽佣统计") @Operation(summary = "导出推广员抽佣统计")
@PreAuthorize("@ss.hasPermission('shop:recharge-order:export')") @PreAuthorize("@ss.hasPermission('shop:recharge-order:export','shop:recharge-order-refund:export')")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
@TenantIgnore @TenantIgnore
public void getRechargeOrderExcel(@Valid PromoterDrawReqExcelVO excelVO, HttpServletResponse response) throws IOException { public void getRechargeOrderExcel(@Valid PromoterDrawReqExcelVO excelVO, HttpServletResponse response) throws IOException {