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

管理端新客立减获取

This commit is contained in:
张松 2025-11-10 11:04:48 +08:00
parent b867ad7dc3
commit 098708f922
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ 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.entity.MkShopConsumeDiscountRecord;
import com.czg.market.service.MkConsumeCashbackRecordService;
import com.czg.market.service.MkConsumeCashbackService;
import com.czg.market.vo.MkConsumeCashbackVO;
@ -63,4 +64,5 @@ public class ConsumeCashbackController {
}
}

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

@ -1,7 +1,9 @@
package com.czg.controller.admin;
import com.czg.market.dto.MkConsumeDiscountDTO;
import com.czg.market.entity.MkShopConsumeDiscountRecord;
import com.czg.market.service.MkConsumeDiscountService;
import com.czg.market.service.MkShopConsumeDiscountRecordService;
import com.czg.market.vo.MkConsumeDiscountVO;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
@ -21,6 +23,8 @@ import java.util.ArrayList;
public class ConsumeDiscountController {
@Resource
private MkConsumeDiscountService consumeDiscountService;
@Resource
private MkShopConsumeDiscountRecordService shopConsumeDiscountRecordService;
/**
* 配置信息获取
@ -42,5 +46,17 @@ public class ConsumeDiscountController {
return CzgResult.success(consumeDiscountService.edit(StpKit.USER.getShopId(), consumeDiscountDTO));
}
/**
* 根据用户id获取新客立减金额，返回null代表不可用
* @param shopId 店铺id
* @param userId 用户id
* @param orderId 订单id 可选
* @return 新客立减金额
*/
@GetMapping("/getDiscountByUserId")
public CzgResult<MkShopConsumeDiscountRecord> getDiscountByUserId(@RequestParam Long shopId, @RequestParam Long userId, @RequestParam(required = false) Long orderId) {
return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, userId, orderId));
}
}