Merge remote-tracking branch 'origin/master'

rentaiming

2024-06-22 98933984fa1353d298a5117fb2a2d044fc51af93

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

@@ -9,8 +9,8 @@
    o.order_no,
    o.member_id,
    CASE
    WHEN o.order_from = 4 THEN 2 -- 当order_from为拍卖订单时，orderType赋值为2
    ELSE 1 -- 其他情况下，orderType赋值为1
    WHEN o.order_from = 4 THEN 2
    ELSE 1
    END AS orderType,
    o.order_from
    FROM
@@ -35,10 +35,12 @@
      <if test="query.status != null">
        AND torr.status = #{query.status}
      </if>
      <if test="query.orderType != null and query.orderType== 1">
      <if
        test="query.orderType != null and @com.ruoyi.common.core.enums.OrderTypeEnum@isMallOrder(query.orderType)">
        AND o.order_from in (1,2,3)
      </if>
      <if test="query.orderType != null and query.orderType== 2">
      <if
        test="query.orderType != null and @com.ruoyi.common.core.enums.OrderTypeEnum@isAuctionOrder(query.orderType)">
        AND o.order_from = 4
      </if>
    </where>
@@ -52,14 +54,14 @@
           o.member_id,
           o.order_time,
           o.pay_time,
           o.paymemt_method,
           o.payment_method,
           o.price,
           o.points,
           o.total_amount,
           o.discount_money,
           CASE
             WHEN o.order_from = 4 THEN 2 -- 当order_from为拍卖订单时，orderType赋值为2
             ELSE 1 -- 其他情况下，orderType赋值为1
             WHEN o.order_from = 4 THEN 2
             ELSE 1
             END AS orderType,
           o.order_from
    FROM t_order_return_request torr