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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
Tankaikai
2024-11-25 16:46:41 +08:00
parent 80ca3204d5 a7eb15781f
commit 2d2f35083e
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,6 +192,7 @@ public class TbCashierCart implements Serializable {
if ("true".equals(isGift)) { if ("true".equals(isGift)) {
totalAmount = packFee; totalAmount = packFee;
} else { } else {
discountSaleAmount = discountSaleAmount == null ? BigDecimal.ZERO : discountSaleAmount;
BigDecimal subtract; BigDecimal subtract;
if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) { if (isMember != null && isMember == 1 && memberPrice != null && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
subtract = memberPrice.subtract(discountSaleAmount); subtract = memberPrice.subtract(discountSaleAmount);