Merge branch 'dev-mitao'

mitao

2024-05-24 c7a3b2836d11492549501e23b66ab5d1cabb1d14

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

@@ -14,4 +14,17 @@
    GROUP BY
      o.member_id
  </select>
  <select id="getOrderByGroupPurchaseId" resultType="com.ruoyi.system.api.domain.Order"
    parameterType="java.lang.Long">
    SELECT
    o.*
    FROM
    t_order_mall tom
    LEFT JOIN t_order o ON tom.order_id = o.id
    <where>
      o.order_status = 2
      AND o.order_from = 3
      AND tom.activity_id = #{id}
    </where>
  </select>
</mapper>