202506111201

ruoyi-system/src/main/resources/mapper/system/GoodsOrderMapper.xml

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and pay_time BETWEEN #{paystartdate} AND #{payenddate}
             </if>
             <if test="uid != null "> and uid = #{uid}</if>
+            <if test="status != null "> and status = #{status}</if>
             <if test="productId != null "> and product_id = #{productId}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
             <if test="transactionId != null  and transactionId != ''"> and transaction_id = #{transactionId}</if>

ruoyi-system/src/main/resources/mapper/system/IntegralLogMapper.xml

@@ -29,8 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uid != null "> and uid = #{uid}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="num != null "> and num = #{num}</if>
-            <if test="createdAt != null "> and created_at = #{createdAt}</if>
-            <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
+
         </where>
         order by id desc
     </select>

ruoyi-system/src/main/resources/mapper/system/OrderLogMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
             <if test="deletedAt != null "> and deleted_at = #{deletedAt}</if>
         </where>
-        order by id desc
+        order by created_at ASC
     </select>
     
     <select id="selectOrderLogById" parameterType="Long" resultMap="OrderLogResult">