mitao
2024-06-17 3bcae65deb665be36618f0987f42b88329c23068
修改bug
2个文件已修改
11 ■■■■ 已修改文件
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderTypeEnum.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderReturnRequestMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderTypeEnum.java
@@ -36,4 +36,11 @@
        return null;
    }
    public static boolean isMallOrder(OrderTypeEnum type) {
        return type.getCode() == MALL_ODER.getCode();
    }
    public static boolean isAuctionOrder(OrderTypeEnum type) {
        return type.getCode() == AUCTION_ORDER.getCode();
    }
}
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderReturnRequestMapper.xml
@@ -36,11 +36,11 @@
        AND torr.status = #{query.status}
      </if>
      <if
        test="query.orderType != null and @com.test.constant.OrderTypeEnum@isMallOrder(query.orderType)">
        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 @com.test.constant.OrderTypeEnum@isAuctionOrder(query.orderType)">
        test="query.orderType != null and @com.ruoyi.common.core.enums.OrderTypeEnum@isAuctionOrder(query.orderType)">
        AND o.order_from = 4
      </if>
    </where>