1

ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml

@@ -19,11 +19,12 @@
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="isCountEnabled" column="is_count_enabled"/>
+        <result property="thirdPartyOrderNo" column="third_party_order_no"/>
     </resultMap>
 
     <sql id="selectJDOrderBase">
         select id, remark, distribution_mark, model_number, link, payment_amount, rebate_amount,
-               address, logistics_link, order_id, buyer, order_time, create_time, update_time, status, is_count_enabled
+               address, logistics_link, order_id, buyer, order_time, create_time, update_time, status, is_count_enabled, third_party_order_no
         from jd_order
     </sql>
 
@@ -95,11 +96,11 @@
         insert into jd_order (
             remark, distribution_mark, model_number, link,
             payment_amount, rebate_amount, address, logistics_link,
-            order_id, buyer, order_time, create_time, update_time, status, is_count_enabled
+            order_id, buyer, order_time, create_time, update_time, status, is_count_enabled, third_party_order_no
         ) values (
             #{remark}, #{distributionMark}, #{modelNumber}, #{link},
             #{paymentAmount}, #{rebateAmount}, #{address}, #{logisticsLink},
-            #{orderId}, #{buyer}, #{orderTime}, now(), now(), #{status}, #{isCountEnabled}
+            #{orderId}, #{buyer}, #{orderTime}, now(), now(), #{status}, #{isCountEnabled}, #{thirdPartyOrderNo}
         )
     </insert>
 
@@ -119,6 +120,7 @@
             <if test="orderTime != null"> order_time = #{orderTime},</if>
             <if test="status != null"> status = #{status},</if>
             <if test="isCountEnabled != null"> is_count_enabled = #{isCountEnabled},</if>
+            <if test="thirdPartyOrderNo != null"> third_party_order_no = #{thirdPartyOrderNo},</if>
             update_time = now()
         </set>
         where id = #{id}

ruoyi-system/src/main/resources/mapper/jarvis/OrderRowsMapper.xml

@@ -124,7 +124,14 @@
             <if test="params.beginTime != null"> and order_time &gt;= #{params.beginTime}</if>
             <if test="params.endTime != null"> and order_time &lt;= #{params.endTime}</if>
         </where>
-        order by order_time desc
+        <choose>
+            <when test="params.orderBy != null and params.orderBy != ''">
+                order by ${params.orderBy} ${params.isAsc}
+            </when>
+            <otherwise>
+                order by order_time desc
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectOrderRowsById" parameterType="String" resultMap="OrderRowsResult">
@@ -195,7 +202,14 @@
                 </foreach>
             </if>
         </where>
-        order by order_time desc
+        <choose>
+            <when test="orderRows.params != null and orderRows.params.orderBy != null and orderRows.params.orderBy != ''">
+                order by ${orderRows.params.orderBy} ${orderRows.params.isAsc}
+            </when>
+            <otherwise>
+                order by order_time desc
+            </otherwise>
+        </choose>
     </select>
 
     <insert id="insertOrderRows" parameterType="OrderRows">