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:
张松
2025-09-26 16:57:36 +08:00
parent e9581d9cfd 9313f0f5d5
commit 006dbc8dde
3 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,15 +138,14 @@ public class ACouponController {
/**
* 优惠券列表/已领取详情
*
* @param search 用户Id/昵称/手机号
* @param param 用户的优惠券列表 使用该对象的UserId
* @param param 用户的优惠券列表 使用该对象的UserId
*/
@GetMapping("/record")
public CzgResult<Page<MkShopCouponRecordDTO>> getRecord(@RequestParam(required = false) String search,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
MkShopCouponRecordDTO param) {
Page<MkShopCouponRecordDTO> data = couponRecordService.getRecord(search, param, startTime, endTime);
public CzgResult<Page<MkShopCouponRecordDTO>> getRecord(
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
MkShopCouponRecordDTO param) {
Page<MkShopCouponRecordDTO> data = couponRecordService.getRecord(param, startTime, endTime);
return CzgResult.success(data);
}
@@ -171,6 +170,7 @@ public class ACouponController {
/**
* 券发放
*
* @return 是否发放成功
*/
@PostMapping("/grant")