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

feat: 会员价相关

Browse Source
This commit is contained in:
张松
2024-11-06 13:50:54 +08:00
parent 7b86cbfcb6
commit e5e0e2a825
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
View File

@@ -91,7 +91,7 @@ public class TbCashierCart implements Serializable {
public void resetTotalAmount() { public void resetTotalAmount() {
if (isMember != null && isMember == 1) { if (isMember != null && isMember == 1 && memberPrice.compareTo(BigDecimal.ZERO) > 0) {
totalAmount = BigDecimal.valueOf(totalNumber).multiply(memberPrice).add(packFee); totalAmount = BigDecimal.valueOf(totalNumber).multiply(memberPrice).add(packFee);
}else { }else {
totalAmount = BigDecimal.valueOf(totalNumber).multiply(salePrice).add(packFee); totalAmount = BigDecimal.valueOf(totalNumber).multiply(salePrice).add(packFee);

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
View File

@@ -45,6 +45,7 @@ public class TbOrderDetail implements Serializable {
private Integer placeNum; private Integer placeNum;
private String useType; private String useType;
private String note; private String note;
private BigDecimal memberPrice;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

7
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -601,7 +601,7 @@ public class CartService {
cashierCart.setNumber(num); cashierCart.setNumber(num);
cashierCart.setTotalNumber(num); cashierCart.setTotalNumber(num);
} }
cashierCart.setIsMember(shopUser.getIsVip() == 1 && productSku.getMemberPrice() != null ? 1 : 0); cashierCart.setIsMember(shopUser.getIsVip() == 1 && productSku.getMemberPrice() != null && productSku.getMemberPrice().compareTo(BigDecimal.ZERO) > 0 ? 1 : 0);
cashierCart.setNote(note); cashierCart.setNote(note);
cashierCart.setProductId(productId); cashierCart.setProductId(productId);
cashierCart.setSkuId(skuId); cashierCart.setSkuId(skuId);
@@ -621,7 +621,7 @@ public class CartService {
cashierCart.setUpdatedAt(Instant.now().toEpochMilli()); cashierCart.setUpdatedAt(Instant.now().toEpochMilli());
cashierCart.setPackFee(BigDecimal.ZERO); cashierCart.setPackFee(BigDecimal.ZERO);
cashierCart.setRefundNumber(0); cashierCart.setRefundNumber(0);
cashierCart.setMemberPrice(productSku.getMemberPrice()); cashierCart.setMemberPrice(productSku.getMemberPrice() == null || productSku.getMemberPrice().compareTo(BigDecimal.ZERO) <= 0 ? productSku.getSalePrice() : productSku.getMemberPrice());
cashierCart.setTradeDay(DateUtils.getDay()); cashierCart.setTradeDay(DateUtils.getDay());
// 打包费 // 打包费
if (isTakeout && product.getPackFee() != null) { if (isTakeout && product.getPackFee() != null) {
@@ -1076,6 +1076,7 @@ public class CartService {
orderDetail.setProductSkuName(productSku.getSpecSnap()); orderDetail.setProductSkuName(productSku.getSpecSnap());
} }
orderDetail.setMemberPrice(cashierCart.getMemberPrice());
orderDetail.setNote(cashierCart.getNote()); orderDetail.setNote(cashierCart.getNote());
orderDetail.setCreateTime(DateUtil.date().toTimestamp()); orderDetail.setCreateTime(DateUtil.date().toTimestamp());
orderDetail.setNum(cashierCart.getNumber()); orderDetail.setNum(cashierCart.getNumber());
@@ -1207,7 +1208,7 @@ public class CartService {
tbCashierCart.setIsMember(0); tbCashierCart.setIsMember(0);
}else { }else {
TbProductSkuWithBLOBs sku = productSkuMapper.selectByPrimaryKey(Integer.valueOf(tbCashierCart.getSkuId())); TbProductSkuWithBLOBs sku = productSkuMapper.selectByPrimaryKey(Integer.valueOf(tbCashierCart.getSkuId()));
tbCashierCart.setIsMember(sku.getMemberPrice() != null ? 1 : 0); tbCashierCart.setIsMember(sku.getMemberPrice() != null && sku.getMemberPrice().compareTo(BigDecimal.ZERO) > 0 ? 1 : 0);
} }
tbCashierCart.resetTotalAmount(); tbCashierCart.resetTotalAmount();
if (TableConstant.CashierCart.ID.equals(tbCashierCart.getProductId())) { if (TableConstant.CashierCart.ID.equals(tbCashierCart.getProductId())) {