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

消费返现修改

This commit is contained in:
张松 2025-10-14 15:38:04 +08:00
parent 46ef03d4bc
commit c40df0294d
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
package com.czg.controller.admin;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.market.dto.MkConsumeCashbackDTO;
import com.czg.market.service.MkConsumeCashbackRecordService;
@ -55,8 +57,9 @@ public class ConsumeCashbackController {
@SaAdminCheckPermission(value = "consumeDiscount:record", name = "消费返现记录")
@GetMapping("/record")
public CzgResult<Map<String, Object>> record(@RequestParam(required = false) Long shopId, @RequestParam(required = false) String key,
@RequestParam(required = false)LocalDateTime startTime, @RequestParam(required = false) LocalDateTime endTime) {
return CzgResult.success(consumeCashbackRecordService.getRecord(StpKit.USER.getShopId(), shopId, key, startTime, endTime));
@RequestParam(required = false)String startTime, @RequestParam(required = false) String endTime) {
return CzgResult.success(consumeCashbackRecordService.getRecord(StpKit.USER.getShopId(), shopId, key,
StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null));
}

6
cash-common/cash-common-service/src/main/java/com/czg/account/dto/freeding/FreeDineConfigEditDTO.java
View File

@ -48,7 +48,13 @@ public class FreeDineConfigEditDTO {
*/
private List<String> useType;
/**
* all 全部 part部分
*/
private String useShopType;
/**
* 可用门店id
*/
private List<Long> shopIdList;
}

2
cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkConsumeCashbackRecordVO.java
View File

@ -71,4 +71,6 @@ public class MkConsumeCashbackRecordVO implements Serializable {
private String nickName;
}