## 下单计算等级查询盒数支持小数处理；

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);
-
     /**
      * 查询新零售购买指定商品数量（新）
      *

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);
-
     /**
      * 查询新零售购买指定商品数量（新）
      *

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);

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