fix: 创建订单会员价修改
This commit is contained in:
@@ -570,7 +570,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
tbCashierCart.setCategoryId(product.getCategoryId());
|
tbCashierCart.setCategoryId(product.getCategoryId());
|
||||||
tbCashierCart.setNote(addCartDTO.getNote());
|
tbCashierCart.setNote(addCartDTO.getNote());
|
||||||
tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue());
|
tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue());
|
||||||
tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() == null ? 0 : 1);
|
// tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() == null ? 0 : 1);
|
||||||
|
tbCashierCart.setIsMember(addCartDTO.getVipUserId() == null ? 0 : 1);
|
||||||
if (tbCashierCart.getIsMember() == 1) {
|
if (tbCashierCart.getIsMember() == 1) {
|
||||||
tbCashierCart.setMemberPrice(productSku.getMemberPrice());
|
tbCashierCart.setMemberPrice(productSku.getMemberPrice());
|
||||||
}
|
}
|
||||||
@@ -1467,7 +1468,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
|
|
||||||
for (TbCashierCart cashierCart : fullCashierCarts) {
|
for (TbCashierCart cashierCart : fullCashierCarts) {
|
||||||
if (orderInfo != null && shopEatTypeInfoDTO != null) {
|
if (orderInfo != null && shopEatTypeInfoDTO != null) {
|
||||||
cashierCart.setIsMember(orderInfo.getMemberId() == null ? 0 : shopEatTypeInfoDTO.isMemberPrice() ? 1 : 0);
|
cashierCart.setIsMember(StrUtil.isBlank(orderInfo.getMemberId()) ? 0 : shopEatTypeInfoDTO.isMemberPrice() ? 1 : 0);
|
||||||
}
|
}
|
||||||
cashierCart.resetTotalAmount();
|
cashierCart.resetTotalAmount();
|
||||||
|
|
||||||
@@ -2650,7 +2651,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
orderInfoMapper.updateById(returnOrder);
|
orderInfoMapper.updateById(returnOrder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
updateStockAndRecord(detailList);
|
updateStockAndRecord(detailList);
|
||||||
mpOrderDetailService.updateBatchById(detailList);
|
mpOrderDetailService.updateBatchById(detailList);
|
||||||
HashMap<String, Object> data = new HashMap<>();
|
HashMap<String, Object> data = new HashMap<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user