czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 优惠券使用逻辑修改

This commit is contained in:
张松 2024-11-11 16:47:59 +08:00
parent ddb6573cc0
commit 68261e6185
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java
View File

@ -401,7 +401,7 @@ public class TbShopCouponServiceImpl extends ServiceImpl<TbShopCouponMapper, TbS
throw new BadRequestException("用户信息不存在"); throw new BadRequestException("用户信息不存在");
} }
List<TbCashierCart> cashierCarts = mpCashierCartService.selectByOrderIdAndState(orderId, TableConstant.OrderInfo.Status.CREATE, TableConstant.OrderInfo.Status.CLOSED); List<TbCashierCart> cashierCarts = mpCashierCartService.selectByOrderIdAndState(orderId, TableConstant.OrderInfo.Status.CREATE, TableConstant.OrderInfo.Status.CLOSED, TableConstant.OrderInfo.Status.FINAL);
List<TbUserCouponVo> activateCouponList = getActivateCoupon(shopUser, orderInfo.getOrderAmount(), shopId, cashierCarts.stream().map(TbCashierCart::getProductId).collect(Collectors.toSet())); List<TbUserCouponVo> activateCouponList = getActivateCoupon(shopUser, orderInfo.getOrderAmount(), shopId, cashierCarts.stream().map(TbCashierCart::getProductId).collect(Collectors.toSet()));
// 将优惠券分类为满减和商品 // 将优惠券分类为满减和商品
ArrayList<TbUserCouponVo> fullReductionCoupon = new ArrayList<>(); ArrayList<TbUserCouponVo> fullReductionCoupon = new ArrayList<>();