无关风月
2024-07-10 4f9d9f37898cb82ba300fa92c38744bf3f47ef36
分表
2个文件已修改
16 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TOrderVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TOrderVO.java
@@ -25,7 +25,7 @@
    /**
     * 主键id
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableId(value = "id", type = IdType.NONE)
    private Long id;
    @ApiModelProperty(value = "用户id")
    private Integer userId;
ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml
@@ -31,21 +31,21 @@
        integral
    </sql>
    <select id="listAll" resultType="com.ruoyi.goods.vo.TOrderVO">
        select t1.*, t2.name as name
        from t_order t1
                 left join t_goods t2 on t1.goodsId = t2.id
        select t_order.*, t_goods.name as name
        from t_order
                 left join t_goods  on t_order.goodsId = t_goods.id
        where 1 = 1
        <if test="null != req.state">
            and t1.state = #{req.state}
            and t_order.state = #{req.state}
        </if>
        <if test="null != req.orderNumber and '' != req.orderNumber">
            and t1.orderNumber like CONCAT('%', #{req.orderNumber}, '%')
            and t_order.orderNumber like CONCAT('%', #{req.orderNumber}, '%')
        </if>
        <if test="null != req.startTime">
            and t1.insertTime between #{req.startTime1} and #{req.endTime1}
            and t_order.insertTime between #{req.startTime1} and #{req.endTime1}
        </if>
        order by t1.state asc, t1.insertTime desc
        order by t_order.state asc, t_order.insertTime desc
    </select>
    <select id="getGoodBuyNumber" resultType="java.lang.Integer">