diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index df696112..33d05fac 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -1270,6 +1270,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { tbActivateOutRecord.setRefNum(0); outRecords.add(tbActivateOutRecord); + couponVo.setFinalDiscountAmount(discountAmount); // 优惠券未消耗完毕 if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) { discountAmount = reduceProCoupon(couponMap, balanceCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId); @@ -1355,6 +1356,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { throw new BadRequestException("存在不可用优惠券"); } couponVo.setCurrentUseNum(item.getNum()); + couponVo.setFinalUseNum(item.getNum()); infoDTO.getProductCouponMap().put(item.getUserCouponId(), couponVo); }); @@ -1917,6 +1919,8 @@ public class TbShopTableServiceImpl implements TbShopTableService { tbActivateOutRecord.setCreateTime(DateUtil.date()); tbActivateOutRecord.setRefNum(0); + couponVo.setFinalDiscountAmount(couponVo.getDiscountAmount()); + } // 计算积分优惠 diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java index 760a3fb0..ea03ff86 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java @@ -29,6 +29,8 @@ public class TbUserCouponVo { private boolean isUse = false; //当前使用数量 private Integer currentUseNum; + private Integer finalUseNum; + private BigDecimal finalDiscountAmount = new BigDecimal(0); public void setEndTime(Date endTime) { @@ -37,4 +39,5 @@ public class TbUserCouponVo { expireTime=endTime.getTime(); } } + }