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

fix: 会员价修复 创建订单分割detail状态丢失修复

This commit is contained in:
张松 2024-11-21 09:17:09 +08:00
parent e7cdc01d9b
commit 3cfb312a8b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,12 +581,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
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 ? 1 : 0); tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() != null ? 1 : 0);
// tbCashierCart.setIsMember(addCartDTO.getVipUserId() == null ? 0 : 1); tbCashierCart.setIsMember(!shopEatTypeInfoDTO.isMemberPrice() ? 0 : addCartDTO.getVipUserId() == null ? 0 : 1);
tbCashierCart.setMemberPrice(productSku.getMemberPrice()); tbCashierCart.setMemberPrice(productSku.getMemberPrice());
cashierCartRepository.save(tbCashierCart); cashierCartRepository.save(tbCashierCart);
} else { } else {
tbCashierCart.setIsMember(shopEatTypeInfoDTO.isMemberPrice() && addCartDTO.getVipUserId() != null ? 1 : 0); tbCashierCart.setIsMember(!shopEatTypeInfoDTO.isMemberPrice() ? 0 : addCartDTO.getVipUserId() == null ? 0 : 1);
tbCashierCart.setNote(addCartDTO.getNote()); tbCashierCart.setNote(addCartDTO.getNote());
tbCashierCart.setTotalAmount(addCartDTO.getNum().multiply(productSku.getSalePrice())); tbCashierCart.setTotalAmount(addCartDTO.getNum().multiply(productSku.getSalePrice()));
@ -1578,6 +1578,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
if (orderDetail == null) { if (orderDetail == null) {
orderDetail = new TbOrderDetail(); orderDetail = new TbOrderDetail();
orderDetail.setStatus(TableConstant.CashierCart.Status.RETURN.equalsVals(cashierCart.getStatus()) ? cashierCart.getStatus() : "unpaid");
priceDTO.setHasNewInfo(true); priceDTO.setHasNewInfo(true);
priceDTO.getNewOrderDetailList().add(orderDetail); priceDTO.getNewOrderDetailList().add(orderDetail);
} }
@ -2706,7 +2707,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbOrderDetail::getShopId, returnOrderDTO.getShopId()) .eq(TbOrderDetail::getShopId, returnOrderDTO.getShopId())
.eq(TbOrderDetail::getStatus, "closed") .eq(TbOrderDetail::getStatus, "closed")
.eq(TbOrderDetail::getOrderId, returnOrderDTO.getOrderId()) .eq(TbOrderDetail::getOrderId, returnOrderDTO.getOrderId())
.in(TbOrderDetail::getId, detailIds)); .in(TbOrderDetail::getId, detailIds)
.orderByDesc(TbOrderDetail::getUserCouponId));
if (detailList.size() != returnOrderDTO.getOrderDetails().size()) { if (detailList.size() != returnOrderDTO.getOrderDetails().size()) {
throw new BadRequestException("订单明细数量不一致"); throw new BadRequestException("订单明细数量不一致");
} }