From 561b61a30b486f94b4aebd54188f2310b2eab6a4 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 1 Jul 2025 14:34:52 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=8B=E5=8D=95=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=9F=A5=E8=AF=A2=E7=9B=92=E6=95=B0=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=B0=8F=E6=95=B0=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/mapper/SaOrderItemsMapper.java | 16 ----------
 .../order/service/ISaOrderItemsService.java   | 12 -------
 .../service/impl/SaOrderItemsServiceImpl.java |  5 ---
 .../mapper/sale/order/SaOrderItemsMapper.xml  | 31 +------------------
 4 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java
index d45385d3..f47c79d2 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderItemsMapper.java
@@ -260,22 +260,6 @@ public interface SaOrderItemsMapper extends BaseMapper<SaOrderItems> {
      */
     List<OrderItemsParam> selectByWaresCodeList(@Param("orderCode") String orderCode);
 
-    /**
-     * 查询新零售购买指定商品数量
-     *
-     * @param pkMember      会员ID
-     * @param waresCodeList 商品编号列表
-     * @param payTime       支付时间（可为null）
-     * @param orderTypeList 订单类型列表
-     * @param systemType    系统类型（可为null）
-     * @return
-     */
-    int getRetailWaresQuantity(@Param("pkMember") Long pkMember,
-                               @Param("waresCodeList") List<String> waresCodeList,
-                               @Param("payTime") Date payTime,
-                               @Param("orderTypeList") List<Integer> orderTypeList,
-                               @Param("systemType") Integer systemType);
-
     /**
      * 查询新零售购买指定商品数量（新）
      *
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java
index 6d9782f2..ff3d19e8 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java
@@ -228,18 +228,6 @@ public interface ISaOrderItemsService extends IService<SaOrderItems> {
      */
     List<OrderItemsParam> selectByWaresCodeList(String orderCode);
 
-    /**
-     * 查询新零售购买指定商品数量
-     *
-     * @param pkMember      会员ID
-     * @param waresCodeList 商品编号列表
-     * @param payTime       支付时间（可为null）
-     * @param orderTypeList 订单类型列表
-     * @param systemType    系统类型（可为null）
-     * @return
-     */
-    int getRetailWaresQuantity(Long pkMember, List<String> waresCodeList, Date payTime, List<Integer> orderTypeList, Integer systemType);
-
     /**
      * 查询新零售购买指定商品数量（新）
      *
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java
index cb083240..5b95d922 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java
@@ -189,11 +189,6 @@ public class SaOrderItemsServiceImpl extends ServiceImpl<SaOrderItemsMapper, SaO
         return baseMapper.selectByWaresCodeList(orderCode);
     }
 
-    @Override
-    public int getRetailWaresQuantity(Long pkMember, List<String> waresCodeList, Date payTime, List<Integer> orderTypeList, Integer systemType) {
-        return baseMapper.getRetailWaresQuantity(pkMember, waresCodeList, payTime, orderTypeList, systemType);
-    }
-
     @Override
     public BigDecimal getRetailWaresQuantityNew(Long pkMember, List<String> waresCodeList, Date payTime, List<Integer> orderTypeList, Integer systemType) {
         return baseMapper.getRetailWaresQuantityNew(pkMember, waresCodeList, payTime, orderTypeList, systemType);
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
index c13dadbb..9188de2e 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml
@@ -1130,38 +1130,9 @@
           and so.ORDER_CODE = #{orderCode}
     </select>
 
-    <!-- 查询新零售购买指定商品数量 -->
-    <select id="getRetailWaresQuantity" resultType="int">
-        select nvl(sum(soi.wares_quantity), 0) wares_quantity
-        from sa_order so
-        left join sa_order_items soi
-        on soi.pk_order = so.pk_id
-        and soi.del_flag = 0
-        and soi.is_gift = 1
-        left join bd_wares bw
-        on bw.pk_id = soi.pk_wares
-        where so.del_flag = 0
-        and so.order_status = 1
-        and so.pk_member = #{pkMember}
-        <if test="systemType != null">
-            and so.system_type = #{systemType}
-        </if>
-        and so.order_type in
-        <foreach collection="orderTypeList" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        and bw.wares_code in
-        <foreach collection="waresCodeList" item="items" open="(" close=")" separator=",">
-            #{items}
-        </foreach>
-        <if test="payTime != null">
-            and so.pay_time > #{payTime}
-        </if>
-    </select>
-
     <!-- 查询新零售购买指定商品数量（新） -->
     <select id="getRetailWaresQuantityNew" resultType="decimal">
-        select nvl(sum(soi.wares_quantity), 0) wares_quantity
+        select sum(nvl(soi.wares_quantity, 0) * bw.box_num) wares_quantity
         from sa_order so
         left join sa_order_items soi
         on soi.pk_order = so.pk_id