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

feat: 订单优惠券信息修改

Browse Source
This commit is contained in:
张松
2024-11-15 14:24:22 +08:00
parent e0626530e0
commit 641b5cb0a9
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -1270,6 +1270,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
tbActivateOutRecord.setRefNum(0); tbActivateOutRecord.setRefNum(0);
outRecords.add(tbActivateOutRecord); outRecords.add(tbActivateOutRecord);
couponVo.setFinalDiscountAmount(discountAmount);
// 优惠券未消耗完毕 // 优惠券未消耗完毕
if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) { if (balanceCart != null && getCanUseCoupon(couponMap, balanceCart.getProductId()) != null) {
discountAmount = reduceProCoupon(couponMap, balanceCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId); discountAmount = reduceProCoupon(couponMap, balanceCart, usedCouponMap, discountAmount, balanceCartList, outRecords, memberId);
@@ -1355,6 +1356,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
throw new BadRequestException("存在不可用优惠券"); throw new BadRequestException("存在不可用优惠券");
} }
couponVo.setCurrentUseNum(item.getNum()); couponVo.setCurrentUseNum(item.getNum());
couponVo.setFinalUseNum(item.getNum());
infoDTO.getProductCouponMap().put(item.getUserCouponId(), couponVo); infoDTO.getProductCouponMap().put(item.getUserCouponId(), couponVo);
}); });
@@ -1917,6 +1919,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
tbActivateOutRecord.setCreateTime(DateUtil.date()); tbActivateOutRecord.setCreateTime(DateUtil.date());
tbActivateOutRecord.setRefNum(0); tbActivateOutRecord.setRefNum(0);
couponVo.setFinalDiscountAmount(couponVo.getDiscountAmount());
} }
// 计算积分优惠 // 计算积分优惠

3
eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java
View File

@@ -29,6 +29,8 @@ public class TbUserCouponVo {
private boolean isUse = false; private boolean isUse = false;
//当前使用数量 //当前使用数量
private Integer currentUseNum; private Integer currentUseNum;
private Integer finalUseNum;
private BigDecimal finalDiscountAmount = new BigDecimal(0);
public void setEndTime(Date endTime) { public void setEndTime(Date endTime) {
@@ -37,4 +39,5 @@ public class TbUserCouponVo {
expireTime=endTime.getTime(); expireTime=endTime.getTime();
} }
} }
} }