From 0794ac75693b20554a5c7acdb571c5d5bab8c1ec Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 12 Sep 2025 17:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E5=B7=B2=E5=8F=91=E6=94=BE=E6=95=B0=E9=87=8F=20giftNum=20?= =?UTF-8?q?=E5=B7=B2=E5=8F=91=E6=94=BE=E6=95=B0=E9=87=8F=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AConsumerCouponController.java | 1 + .../market/dto/MkShopConsumerCouponDTO.java | 5 ++++ .../com/czg/market/dto/ShopCouponDTO.java | 4 +++ .../market/entity/MkShopConsumerCoupon.java | 5 ++++ .../com/czg/market/entity/ShopCoupon.java | 4 +++ .../impl/MkShopConsumerCouponServiceImpl.java | 26 ++++++++++++++++++- .../service/impl/ShopCouponServiceImpl.java | 24 ++++++++++++----- 7 files changed, 62 insertions(+), 7 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/AConsumerCouponController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/AConsumerCouponController.java index 492218f6..f7ae8c6b 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/AConsumerCouponController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/AConsumerCouponController.java @@ -50,6 +50,7 @@ public class AConsumerCouponController { public CzgResult addConsumerCoupon(@RequestBody MkShopConsumerCouponDTO param) { Long shopId = StpKit.USER.getShopId(0L); param.setShopId(shopId); + param.setLeftNum(param.getGiveNum()); mkShopConsumerCouponService.addConsumerCoupon(param); return CzgResult.success(); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkShopConsumerCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkShopConsumerCouponDTO.java index d2070f1e..c889d4c0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkShopConsumerCouponDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkShopConsumerCouponDTO.java @@ -66,6 +66,11 @@ public class MkShopConsumerCouponDTO implements Serializable { */ private Integer giveNum; + /** + * 已发放数量 + */ + private Integer giftNum; + /** * 每人领取限量，-10086为不限量 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java index e27712bc..d8f4d1d7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java @@ -140,6 +140,10 @@ public class ShopCouponDTO implements Serializable { * 总发放数量，-10086为不限量 */ private Integer giveNum; + /** + * 已发放数量 + */ + private Integer giftNum; /** * 可领取用户：全部/all，新用户一次/new，仅会员/vip diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumerCoupon.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumerCoupon.java index dc411685..80f77453 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumerCoupon.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumerCoupon.java @@ -69,6 +69,11 @@ public class MkShopConsumerCoupon implements Serializable { */ private Integer giveNum; + /** + * 已发放数量 + */ + private Integer giftNum; + /** * 每人领取限量，-10086为不限量 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java index 8f4f7a3b..0d53e118 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java @@ -134,6 +134,10 @@ public class ShopCoupon implements Serializable { * 总发放数量，-10086为不限量 */ private Integer giveNum; + /** + * 已发放数量 + */ + private Integer giftNum; /** * 可领取用户：全部/all，新用户一次/new，仅会员/vip diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java index e4f74948..a6a2660b 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java @@ -1,8 +1,10 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.exceptions.ValidateException; import com.czg.market.dto.MkShopConsumerCouponDTO; import com.czg.market.entity.MkShopConsumerCoupon; +import com.czg.market.entity.ShopCoupon; import com.czg.market.service.MkCouponGiftService; import com.czg.market.service.MkShopConsumerCouponService; import com.czg.service.market.mapper.MkShopConsumerCouponMapper; @@ -28,7 +30,7 @@ public class MkShopConsumerCouponServiceImpl extends ServiceImpl getConsumerCouponPage(MkShopConsumerCouponDTO param) { + public Page getConsumerCouponPage(MkShopConsumerCouponDTO param) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(MkShopConsumerCoupon::getShopId, param.getShopId()) .orderBy(MkShopConsumerCoupon::getCreateTime).desc(); @@ -61,6 +63,28 @@ public class MkShopConsumerCouponServiceImpl extends ServiceImpl