From 3cfb312a8badce73bfc346c98e7118046f84d622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 21 Nov 2024 09:17:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=9A=E5=91=98=E4=BB=B7=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E5=89=B2detail=E7=8A=B6=E6=80=81=E4=B8=A2=E5=A4=B1=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 75d6fa31..d0f7c11f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -581,12 +581,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             tbCashierCart.setNote(addCartDTO.getNote());
             tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue());
             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());
             cashierCartRepository.save(tbCashierCart);
 
         } 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.setTotalAmount(addCartDTO.getNum().multiply(productSku.getSalePrice()));
 
@@ -1578,6 +1578,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
             if (orderDetail == null) {
                 orderDetail = new TbOrderDetail();
+                orderDetail.setStatus(TableConstant.CashierCart.Status.RETURN.equalsVals(cashierCart.getStatus()) ? cashierCart.getStatus() : "unpaid");
                 priceDTO.setHasNewInfo(true);
                 priceDTO.getNewOrderDetailList().add(orderDetail);
             }
@@ -2706,7 +2707,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 .eq(TbOrderDetail::getShopId, returnOrderDTO.getShopId())
                 .eq(TbOrderDetail::getStatus, "closed")
                 .eq(TbOrderDetail::getOrderId, returnOrderDTO.getOrderId())
-                .in(TbOrderDetail::getId, detailIds));
+                .in(TbOrderDetail::getId, detailIds)
+                .orderByDesc(TbOrderDetail::getUserCouponId));
         if (detailList.size() != returnOrderDTO.getOrderDetails().size()) {
             throw new BadRequestException("订单明细数量不一致");
         }