czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-10-21 18:09:00 +08:00
parent 86282ee1ac 15d93a54cd
commit 022dafec0b
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/market-server/src/main/java/com/czg/controller/admin/RechargeRedemptionController.java
View File

@@ -100,7 +100,6 @@ public class RechargeRedemptionController {
* @return 是否成功 * @return 是否成功
*/ */
@SaAdminCheckPermission(value = "rechargeRedemption:codeList", name = "充值兑换码列表") @SaAdminCheckPermission(value = "rechargeRedemption:codeList", name = "充值兑换码列表")
@SaCheckMainShop
@GetMapping("/code/list") @GetMapping("/code/list")
public CzgResult<Page<MkRechargeRedemptionCodeVO>> codeList(@RequestParam Long redemptionId, @RequestParam(required = false) String code, @RequestParam(required = false) Integer status) { public CzgResult<Page<MkRechargeRedemptionCodeVO>> codeList(@RequestParam Long redemptionId, @RequestParam(required = false) String code, @RequestParam(required = false) Integer status) {
return CzgResult.success(configService.codeList(StpKit.USER.getMainShopId(), redemptionId, code, status)); return CzgResult.success(configService.codeList(StpKit.USER.getMainShopId(), redemptionId, code, status));
@@ -110,7 +109,6 @@ public class RechargeRedemptionController {
* 充值兑换码导出 * 充值兑换码导出
*/ */
@SaAdminCheckPermission(value = "rechargeRedemption:codeExport", name = "充值兑换码列表导出") @SaAdminCheckPermission(value = "rechargeRedemption:codeExport", name = "充值兑换码列表导出")
@SaCheckMainShop
@GetMapping("/code/export") @GetMapping("/code/export")
public void exportCodeList(@RequestParam Long redemptionId, @RequestParam(required = false) String code, @RequestParam(required = false) Integer status, public void exportCodeList(@RequestParam Long redemptionId, @RequestParam(required = false) String code, @RequestParam(required = false) Integer status,
HttpServletResponse response, HttpServletRequest request) { HttpServletResponse response, HttpServletRequest request) {