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

1.已退单商品忽略订单总价

Browse Source
This commit is contained in:
SongZhang
2024-09-11 18:00:46 +08:00
parent 7921c21295
commit 3b9617a03e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,7 +537,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
// 会员点单 // 会员点单
TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>() TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, removeCartDTO.getShopId()) .eq(TbCashierCart::getShopId, removeCartDTO.getShopId())
.in(TbCashierCart::getStatus, "create") .in(TbCashierCart::getStatus, "create", "refund")
.eq(TbCashierCart::getId, removeCartDTO.getCartId())); .eq(TbCashierCart::getId, removeCartDTO.getCartId()));
if (cashierCart == null) { if (cashierCart == null) {
@@ -1027,9 +1027,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if ("-999".equals(cashierCart.getProductId())) { if ("-999".equals(cashierCart.getProductId())) {
mealCost = true; mealCost = true;
} }
totalAmount = totalAmount.add(cashierCart.getTotalAmount()); if (!"return".equals(cashierCart.getStatus())) {
packAMount = packAMount.add(cashierCart.getPackFee()); totalAmount = totalAmount.add(cashierCart.getTotalAmount());
feeAmount = cashierCart.getPackFee(); packAMount = packAMount.add(cashierCart.getPackFee());
feeAmount = cashierCart.getPackFee();
}
TbProductSku productSku = productSkuRepository.findById(Integer.valueOf(cashierCart.getSkuId())).orElse(null); TbProductSku productSku = productSkuRepository.findById(Integer.valueOf(cashierCart.getSkuId())).orElse(null);
TbOrderDetail orderDetail = new TbOrderDetail(); TbOrderDetail orderDetail = new TbOrderDetail();
@@ -1047,7 +1050,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderDetail.setProductName(cashierCart.getName()); orderDetail.setProductName(cashierCart.getName());
orderDetail.setShopId(Integer.valueOf(cashierCart.getShopId())); orderDetail.setShopId(Integer.valueOf(cashierCart.getShopId()));
orderDetail.setPackAmount(cashierCart.getPackFee()); orderDetail.setPackAmount(cashierCart.getPackFee());
orderDetail.setStatus("unpaid"); orderDetail.setStatus("return");
orderDetail.setProductImg(cashierCart.getCoverImg()); orderDetail.setProductImg(cashierCart.getCoverImg());
orderDetails.add(orderDetail); orderDetails.add(orderDetail);
if (cashierCart.getOrderId() != null) { if (cashierCart.getOrderId() != null) {