Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-15 2427b05aeca08ee3c4998843bf749d35440d461b

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

@@ -58,15 +58,44 @@
    o.goods_sku_id as goodsSkuId
    FROM
    t_order o
    LEFT JOIN t_goods_sku tgs ON o.goods_sku_id = tgs.id
    <where>
       o.order_status = 2
      o.order_status = 2
      <if test="skuName != null and skuName != ''">
        AND tgs.goods_sku_name LIKE CONCAT('%',#{skuName},'%')
        AND o.sku_name LIKE CONCAT('%',#{skuName},'%')
      </if>
      AND o.order_from = 3
      AND   o.member_id=#{memberId}
    </where>
  </select>

  <select id="getOrderByGroupPurchaseMemberList" resultType="com.ruoyi.system.api.domain.vo.OrderVO">
    SELECT
    o.*,
    o.goods_sku_id as goodsSkuId
    FROM
    t_order o
    <where>
      o.order_status = 2
      <if test="skuName != null and skuName != ''">
        AND o.sku_name LIKE CONCAT('%',#{skuName},'%')
      </if>
      AND o.order_from = 3
      AND   o.member_id=#{memberId}
    </where>
  </select>


  <select id="getOrderByGroupPurchaseMemberId" resultType="com.ruoyi.system.api.domain.vo.OrderVO">
    SELECT
    o.*
    FROM
    t_order o
    <where>
      o.goods_sku_id = #{goodsSkuId}
      AND o.order_status = 2 or  o.order_status =1
      AND o.order_from = 3
      AND   o.member_id=#{memberId}
    </where>
  </select>

</mapper>