From 75f2eebf7e1dabcbb965a45a28e380aa13f59663 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 13 Apr 2026 10:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/order/entity/OrderDetail.java |  2 ++
 .../service/impl/OrderInfoCustomServiceImpl.java    | 13 +------------
 .../src/main/resources/mapper/CashierCartMapper.xml |  1 +
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java
index c55833f05..bf8a72134 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderDetail.java
@@ -162,6 +162,8 @@ public class OrderDetail implements Serializable {
      * 是否等叫
      */
     private Integer isWaitCall;
+    @Column(ignore = true)
+    private Integer isAutoSoldStock;
 
     /**
      * 套餐商品选择信息
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
index bd50b79fb..062ec684f 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
@@ -45,7 +45,6 @@ import com.czg.order.vo.*;
 import com.czg.pay.PayNotifyRespDTO;
 import com.czg.product.entity.Product;
 import com.czg.product.entity.ShopProdCategory;
-import com.czg.product.service.ConsInfoService;
 import com.czg.product.service.ProductRpcService;
 import com.czg.product.service.ProductService;
 import com.czg.product.service.ShopProdCategoryService;
@@ -1048,7 +1047,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
         BigDecimal packFee = BigDecimal.ZERO;
         Map<Long, BigDecimal> productNumMap = new HashMap<>();
         for (OrderDetail detail : orderDetails) {
-            if (!detail.getIsTemporary().equals(1) && detail.getProductId() > 0) {
+            if (!detail.getIsTemporary().equals(1) && detail.getProductId() > 0 && 1 == detail.getIsAutoSoldStock()) {
                 if (productNumMap.containsKey(detail.getProductId())) {
                     productNumMap.put(detail.getProductId(), productNumMap.get(detail.getProductId()).add(detail.getNum().subtract(detail.getReturnNum())));
                 } else {
@@ -1086,16 +1085,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
         if (CollUtil.isEmpty(productNumMap)) {
             return;
         }
-//        List<ConsInfo> consStockList = consInfoService.list(new QueryWrapper().select(ConsInfo::getId, ConsInfo::getConName, ConsInfo::getConUnit, ConsInfo::getStockNumber)
-//                .eq(ConsInfo::getShopId, shopId).eq(ConsInfo::getIsStock, 1));
-//        if (CollUtil.isEmpty(consStockList)) {
-//            return;
-//        }
-//        Map<Long, ConsInfo> map = consStockList.stream()
-//                .collect(Collectors.toMap(
-//                        ConsInfo::getId,
-//                        Function.identity()
-//                ));
         List<ConsStockRecord> consNumList = orderInfoCustomMapper.getConsByProductAndNum(shopId, productNumMap);
         for (ConsStockRecord consStockRecord : consNumList) {
             if (consStockRecord.getStockNumber().compareTo(consStockRecord.getCurrentStockNumber()) > 0) {
diff --git a/cash-service/order-service/src/main/resources/mapper/CashierCartMapper.xml b/cash-service/order-service/src/main/resources/mapper/CashierCartMapper.xml
index 442c3e114..0b9808ed8 100644
--- a/cash-service/order-service/src/main/resources/mapper/CashierCartMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/CashierCartMapper.xml
@@ -19,6 +19,7 @@
                cart.product_id                             as productId,
                pros.cover_img                              as productImg,
                pros.type                                   as productType,
+               pros.is_auto_sold_stock                     as isAutoSoldStock,
                cart.sku_id                                 as skuId,
                cart.is_time_discount                       as isTimeDiscount,
                skus.spec_info                              as skuName,