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

引流配置修改

Browse Source
This commit is contained in:
张松
2025-10-15 11:32:00 +08:00
parent b2c287d368
commit 47cea3310c
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ public class BirthdayGiftController {
@SaAdminCheckPermission(value = "birthdayGift:detail", name = "生日有礼详情")
@GetMapping
public CzgResult<MkBirthdayGiftVO> detail() {
return CzgResult.success(service.detail(StpKit.USER.getShopId()));
return CzgResult.success(service.detail(StpKit.USER.getMainShopId()));
}
/**
@@ -43,7 +43,7 @@ public class BirthdayGiftController {
@SaAdminCheckPermission(value = "birthdayGift:edit", name = "生日有礼修改")
@PostMapping
public CzgResult<Boolean> edit(@Validated @RequestBody MkBirthdayGiftDTO giftDTO) {
return CzgResult.success(service.edit(StpKit.USER.getShopId(), giftDTO));
return CzgResult.success(service.edit(StpKit.USER.getMainShopId(), giftDTO));
}
@@ -54,7 +54,7 @@ public class BirthdayGiftController {
@SaAdminCheckPermission(value = "birthdayGift:record", name = "生日有礼记录")
@GetMapping("/record")
public CzgResult<Page<MkBirthdayGiftRecordVO>> record(@RequestParam(required = false) LocalDateTime dateTime, @RequestParam(required = false) String key) {
return CzgResult.success(service.getRecord(StpKit.USER.getShopId(), key, dateTime));
return CzgResult.success(service.getRecord(StpKit.USER.getMainShopId(), key, dateTime));
// return null;
}
@@ -65,7 +65,7 @@ public class BirthdayGiftController {
@SaAdminCheckPermission(value = "birthdayGift:summary", name = "生日有礼概述")
@GetMapping("/summary")
public CzgResult<MkBirthdayGiftRecordSummaryVO> summary(@RequestParam(required = false) LocalDateTime dateTime, @RequestParam(required = false) String key) {
return CzgResult.success(service.summary(StpKit.USER.getShopId(), key, dateTime));
return CzgResult.success(service.summary(StpKit.USER.getMainShopId(), key, dateTime));
// return null;
}

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

@@ -36,7 +36,7 @@ public class ConsumeCashbackController {
@SaAdminCheckPermission(value = "consumeDiscount:detail", name = "消费返现详情")
@GetMapping
public CzgResult<MkConsumeCashbackVO> detail() {
return CzgResult.success(service.detail(StpKit.USER.getShopId()));
return CzgResult.success(service.detail(StpKit.USER.getMainShopId()));
}
/**
@@ -58,7 +58,7 @@ public class ConsumeCashbackController {
@GetMapping("/record")
public CzgResult<Map<String, Object>> record(@RequestParam(required = false) Long shopId, @RequestParam(required = false) String key,
@RequestParam(required = false)String startTime, @RequestParam(required = false) String endTime) {
return CzgResult.success(consumeCashbackRecordService.getRecord(StpKit.USER.getShopId(), shopId, key,
return CzgResult.success(consumeCashbackRecordService.getRecord(StpKit.USER.getMainShopId(), shopId, key,
StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null));
}