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

fix: 修复打包未计算的问题

Browse Source
This commit is contained in:
张松
2024-11-06 17:21:32 +08:00
parent 6c5940c6ea
commit e6145311ed
2 changed files with 4 additions and 1 deletions
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

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

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

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