diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java index f6404bbc3..76d67062d 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UShopConsumeDiscountController.java @@ -41,7 +41,7 @@ public class UShopConsumeDiscountController { */ @GetMapping public CzgResult get(@RequestParam Long shopId, @RequestParam Long orderId) { - return CzgResult.success(shopConsumeDiscountRecordService.get(shopId, StpKit.USER.getLoginIdAsLong(), orderId)); + return CzgResult.success(shopConsumeDiscountRecordService.getDiscount(shopId, StpKit.USER.getLoginIdAsLong(), orderId)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumeDiscountRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumeDiscountRecord.java index d8f7cee75..3e36bfa3c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumeDiscountRecord.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumeDiscountRecord.java @@ -61,5 +61,6 @@ public class MkShopConsumeDiscountRecord implements Serializable { * 门店id */ private Long shopId; + private Integer isUse; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java index 19f63f987..b284766e0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java @@ -10,5 +10,19 @@ import com.czg.market.entity.MkShopConsumeDiscountRecord; * @since 2025-09-17 */ public interface MkShopConsumeDiscountRecordService extends IService { - MkShopConsumeDiscountRecord get(Long shopId, Long userId, Long orderId); + /** + * 获取减免金额 + * @param shopId 门店id + * @param userId 用户id + * @param orderId 订单id + * @return 减免信息 + */ + MkShopConsumeDiscountRecord getDiscount(Long shopId, Long userId, Long orderId); + + /** + * 修改记录状态 + * @param recordId MkShopConsumeDiscountRecord 主键 + * @return 是否成功 + */ + boolean useDiscount(Long recordId); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java index 3207480e8..e31c63aca 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumeDiscountRecordServiceImpl.java @@ -1,5 +1,8 @@ package com.czg.service.market.service.impl; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import com.czg.account.entity.ShopUser; import com.czg.account.service.ShopUserService; import com.czg.constant.TableValueConstant; @@ -32,8 +35,16 @@ public class MkShopConsumeDiscountRecordServiceImpl extends ServiceImpl