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

feat: 会员价根据店铺设置返回

Browse Source
This commit is contained in:
张松
2024-11-07 16:10:57 +08:00
parent af1f990c73
commit 0d8052d620
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

@@ -82,7 +82,7 @@ public class TbCashierCart implements Serializable {
if ("true".equals(isGift)) { if ("true".equals(isGift)) {
totalAmount = packFee; totalAmount = packFee;
}else { }else {
if (isMember != null && isMember == 1) { if (isMember != null && isMember == 1 && memberPrice != null && 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/dto/ShopEatTypeInfoDTO.java
View File

@@ -12,6 +12,7 @@ public class ShopEatTypeInfoDTO {
private boolean isDineInAfter; private boolean isDineInAfter;
private boolean isDineInBefore; private boolean isDineInBefore;
private boolean needSeatFee; private boolean needSeatFee;
private boolean isMemberPrice;
private TbShopInfo shopInfo; private TbShopInfo shopInfo;
private String useType; private String useType;
private String sendType; private String sendType;

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

@@ -165,8 +165,9 @@ public class OrderService {
boolean isDineInAfter = !isMunchies && !isTakeout; boolean isDineInAfter = !isMunchies && !isTakeout;
boolean isDineInBefore = isMunchies && !isTakeout; boolean isDineInBefore = isMunchies && !isTakeout;
boolean needSeatFee = !isTakeout && (shopInfo.getIsTableFee() == null || shopInfo.getIsTableFee() == 0); boolean needSeatFee = !isTakeout && (shopInfo.getIsTableFee() == null || shopInfo.getIsTableFee() == 0);
boolean isMemberPrice = shopInfo.getIsMemberPrice() != null && shopInfo.getIsMemberPrice() == 1;
return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, needSeatFee, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() : return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, needSeatFee, isMemberPrice, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() :
isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(), isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue()); isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(), isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue());
} }
@@ -354,7 +355,7 @@ public class OrderService {
cashierCart.setSalePrice(skuWithBLOBs.getSalePrice()); cashierCart.setSalePrice(skuWithBLOBs.getSalePrice());
cashierCart.setSkuId(skuWithBLOBs.getId().toString()); cashierCart.setSkuId(skuWithBLOBs.getId().toString());
cashierCart.setSkuName(skuWithBLOBs.getSpecSnap()); cashierCart.setSkuName(skuWithBLOBs.getSpecSnap());
cashierCart.setMemberPrice(skuWithBLOBs.getMemberPrice() != null && skuWithBLOBs.getMemberPrice().compareTo(BigDecimal.ZERO) > 0 ? skuWithBLOBs.getMemberPrice() : skuWithBLOBs.getSalePrice()); cashierCart.setMemberPrice(skuWithBLOBs.getMemberPrice());
cashierCart.setIsMember(0); cashierCart.setIsMember(0);
} }
cashierCart.setShopId(shopId.toString()); cashierCart.setShopId(shopId.toString());
@@ -860,7 +861,7 @@ public class OrderService {
ArrayList<TbOrderDetail> addOrderDetailList = new ArrayList<>(); ArrayList<TbOrderDetail> addOrderDetailList = new ArrayList<>();
for (TbCashierCart cashierCart : list) { for (TbCashierCart cashierCart : list) {
cashierCart.setIsMember(orderVo.getVipUserId() == null ? 0: 1); cashierCart.setIsMember(eatTypeInfoDTO.isMemberPrice() && orderVo.getVipUserId() != null && orderVo.getVipUserId() == 1 ? 1 : 0);
cashierCart.resetTotalAmount(); cashierCart.resetTotalAmount();
// 设置下单次数 // 设置下单次数
if (cashierCart.getPlaceNum() == null) { if (cashierCart.getPlaceNum() == null) {