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-21 18:19:12 +08:00
parent 9549aef3bd
commit c3409461c8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java
View File

@ -204,6 +204,9 @@ public class TbCashierCart implements Serializable {
* 根据是否会员充值价格 * 根据是否会员充值价格
*/ */
public void resetTotalAmount(BigDecimal discountRadio) { public void resetTotalAmount(BigDecimal discountRadio) {
if (discountRadio == null) {
discountRadio = BigDecimal.ONE;
}
if ("false".equals(isPack)) { if ("false".equals(isPack)) {
packFee = BigDecimal.ZERO; packFee = BigDecimal.ZERO;
} }

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

@ -1582,7 +1582,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (orderInfo != null && shopEatTypeInfoDTO != null) { if (orderInfo != null && shopEatTypeInfoDTO != null) {
cashierCart.setIsMember(StrUtil.isBlank(orderInfo.getMemberId()) ? 0 : shopEatTypeInfoDTO.isMemberPrice() ? 1 : 0); cashierCart.setIsMember(StrUtil.isBlank(orderInfo.getMemberId()) ? 0 : shopEatTypeInfoDTO.isMemberPrice() ? 1 : 0);
} }
cashierCart.resetTotalAmount(); cashierCart.resetTotalAmount(orderInfo == null ? null : orderInfo.getDiscountRatio());
// 已经退款和使用优惠券的商品不进行统计金额 // 已经退款和使用优惠券的商品不进行统计金额
if (!"return".equals(cashierCart.getStatus()) && cashierCart.getUserCouponId() == null) { if (!"return".equals(cashierCart.getStatus()) && cashierCart.getUserCouponId() == null) {