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 10:23:20 +08:00
parent 610b0f327b
commit 667151fefb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1488,6 +1488,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
ArrayList<Integer> cartIdList = new ArrayList<>(); ArrayList<Integer> cartIdList = new ArrayList<>();
// 订单总价 // 订单总价
for (TbCashierCart tbCashierCart : cartInfoDTO.getCashierCarts()) { for (TbCashierCart tbCashierCart : cartInfoDTO.getCashierCarts()) {
if (shopUser != null) {
tbCashierCart.setIsMember(!shopEatTypeInfoDTO.isMemberPrice() ? 0 : shopUser.getIsVip() == 1 ? 0 : 1);
}
tbCashierCart.resetTotalAmount();
if (tbCashierCart.getOrderId() != null) { if (tbCashierCart.getOrderId() != null) {
cartInfoDTO.setOrderId(tbCashierCart.getOrderId()); cartInfoDTO.setOrderId(tbCashierCart.getOrderId());
} }
@ -1495,10 +1500,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (TableConstant.CashierCart.Status.CREATE.equalsVals(tbCashierCart.getStatus())) { if (TableConstant.CashierCart.Status.CREATE.equalsVals(tbCashierCart.getStatus())) {
cartInfoDTO.setNewAddTotalAmount(cartInfoDTO.getNewAddTotalAmount().add(tbCashierCart.getTotalAmount())); cartInfoDTO.setNewAddTotalAmount(cartInfoDTO.getNewAddTotalAmount().add(tbCashierCart.getTotalAmount()));
} }
if (shopUser != null) {
tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && tbCashierCart.getMemberPrice() == null && shopUser.getIsVip() == 1 ? 0 : 1);
}
tbCashierCart.resetTotalAmount();
cartInfoDTO.setTotalAmount(cartInfoDTO.getTotalAmount().add(tbCashierCart.getTotalAmount())); cartInfoDTO.setTotalAmount(cartInfoDTO.getTotalAmount().add(tbCashierCart.getTotalAmount()));
} }
@ -2433,8 +2434,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.set(TbOrderInfo::getUserId, null) .set(TbOrderInfo::getUserId, null)
.set(TbOrderInfo::getMemberId, null)); .set(TbOrderInfo::getMemberId, null));
} }
if (dto != null) { if (dto != null) {
dto.setVipUserId(updateVipDTO.getVipUserId());
return createOrder(dto, true); return createOrder(dto, true);
} }
return "哈哈哈"; return "哈哈哈";