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

新增字段 已发放数量 giftNum 

已发放数量 问题
This commit is contained in:
wangw 2025-09-12 17:56:11 +08:00
parent e6fe3e66c7
commit 0794ac7569
7 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ public class AConsumerCouponController {
public CzgResult<Void> addConsumerCoupon(@RequestBody MkShopConsumerCouponDTO param) {
Long shopId = StpKit.USER.getShopId(0L);
param.setShopId(shopId);
param.setLeftNum(param.getGiveNum());
mkShopConsumerCouponService.addConsumerCoupon(param);
return CzgResult.success();
}

5
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkShopConsumerCouponDTO.java
View File

@ -66,6 +66,11 @@ public class MkShopConsumerCouponDTO implements Serializable {
*/
private Integer giveNum;
/**
* 已发放数量
*/
private Integer giftNum;
/**
* 每人领取限量，-10086为不限量
*/

4
cash-common/cash-common-service/src/main/java/com/czg/market/dto/ShopCouponDTO.java
View File

@ -140,6 +140,10 @@ public class ShopCouponDTO implements Serializable {
* 总发放数量，-10086为不限量
*/
private Integer giveNum;
/**
* 已发放数量
*/
private Integer giftNum;
/**
* 可领取用户：全部/all，新用户一次/new，仅会员/vip

5
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopConsumerCoupon.java
View File

@ -69,6 +69,11 @@ public class MkShopConsumerCoupon implements Serializable {
*/
private Integer giveNum;
/**
* 已发放数量
*/
private Integer giftNum;
/**
* 每人领取限量，-10086为不限量
*/

4
cash-common/cash-common-service/src/main/java/com/czg/market/entity/ShopCoupon.java
View File

@ -134,6 +134,10 @@ public class ShopCoupon implements Serializable {
* 总发放数量，-10086为不限量
*/
private Integer giveNum;
/**
* 已发放数量
*/
private Integer giftNum;
/**
* 可领取用户：全部/all，新用户一次/new，仅会员/vip

26
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopConsumerCouponServiceImpl.java
View File

@ -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<MkShopConsumerC
private MkCouponGiftService couponGiftService;
@Override
public Page<MkShopConsumerCouponDTO> getConsumerCouponPage(MkShopConsumerCouponDTO param) {
public Page<MkShopConsumerCouponDTO> 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<MkShopConsumerC
@Override
@Transactional
public void updateConsumerCouponById(MkShopConsumerCouponDTO param) {
MkShopConsumerCoupon consumerCoupon = getById(param.getId());
if (consumerCoupon.getGiveNum() == -10086) {
if (param.getGiveNum() == -10086) {
param.setLeftNum(-10086);
} else {
if (param.getGiveNum() < consumerCoupon.getGiftNum()) {
throw new ValidateException("修改失败 总发放数量必须大于已发放数量");
} else {
param.setLeftNum(param.getGiveNum() - consumerCoupon.getGiftNum());
}
}
} else {
if (param.getGiveNum() == -10086) {
param.setLeftNum(-10086);
} else {
if (param.getGiveNum() < consumerCoupon.getGiftNum()) {
throw new ValidateException("修改失败 总发放数量必须大于已发放数量");
} else {
param.setLeftNum(param.getGiveNum() - consumerCoupon.getGiftNum());
}
}
}
updateById(BeanUtil.toBean(param, MkShopConsumerCoupon.class), true);
//更新优惠券信息/数量
couponGiftService.addCouponGift(param.getId(), "消费赠券", 3, param.getCouponGiftList());

24
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
View File

@ -51,12 +51,24 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
@Override
public void updateCouponById(ShopCouponDTO param) {
if (param.getGiveNum() != null && param.getGiveNum() != -10086) {
ShopCoupon tbShopCoupon = getById(param.getId());
if (param.getGiveNum() < tbShopCoupon.getGiveNum()) {
throw new ValidateException("修改失败 发放数量不可减少");
} else {
param.setLeftNum(tbShopCoupon.getLeftNum() + tbShopCoupon.getGiveNum() - param.getGiveNum());
ShopCoupon tbShopCoupon = getById(param.getId());
if (tbShopCoupon.getGiveNum() == -10086) {
if (param.getGiveNum() != -10086) {
if (param.getGiveNum() < tbShopCoupon.getGiftNum()) {
throw new ValidateException("修改失败 总发放数量必须大于已发放数量");
}else {
param.setLeftNum(param.getGiveNum() - tbShopCoupon.getGiftNum());
}
}
}else {
if(param.getGiveNum()== -10086){
param.setLeftNum(-10086);
}else {
if (param.getGiveNum() < tbShopCoupon.getGiftNum()) {
throw new ValidateException("修改失败 总发放数量必须大于已发放数量");
}else {
param.setLeftNum(param.getGiveNum() - tbShopCoupon.getGiftNum());
}
}
}
ShopCoupon coupon = BeanUtil.toBean(param, ShopCoupon.class);