Merge remote-tracking branch 'origin/master'

mitao

2024-06-19 d4f159d60acf6f263bfa4508a113c0feacd2f5b9

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -6,6 +6,7 @@
    SELECT ifnull(count(1), 0) FROM t_order o
    WHERE
      o.goods_sku_id = #{id}
      AND o.order_from=2
      AND o.order_status IN (2
        , 3
        , 4)
@@ -15,14 +16,16 @@



  <select id="getSeckillMembers1" resultType="com.ruoyi.system.api.domain.dto.MemberOrderDTO">
    SELECT ifnull(SUM(o.goods_quantity), 0) FROM t_order o LEFT
    WHERE

  <select id="getGoodsGroupPurchase" resultType="java.lang.Integer">
    SELECT ifnull(SUM(o.goods_quantity), 0) FROM t_order o
      WHERE
      o.goods_sku_id = #{goodsSkuId}
      AND o.order_status IN (2
        , 3)
     and o.member_id =#{memberId}
      AND o.order_from=3
      AND o.order_status IN (2,3,4)
      and o.member_id =#{memberId}
  </select>


  <select id="getOrderByGroupPurchaseId" resultType="com.ruoyi.system.api.domain.Order"
    parameterType="java.lang.Long">
@@ -85,7 +88,7 @@
  </select>


  <select id="getOrderByGroupPurchaseMemberId" resultType="com.ruoyi.system.api.domain.vo.OrderVO">
  <select id="getOrderByGroupPurchaseMemberId" resultType="com.ruoyi.system.api.domain.Order">
    SELECT
    o.*
    FROM