Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html

@@ -191,6 +191,10 @@
                     field: 'orderType',
                     title: '客户端'
                 },
+                {
+                    field: 'createdAt',
+                    title: '创建时间'
+                },
                 {
                     title: '操作',
                     align: 'center',

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml

@@ -56,5 +56,6 @@
                 and amo.payment_at < #{paymentAtEnd}
             </if>
         </where>
+        order by amo.created_at desc
     </select>
 </mapper>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderTicketsListDao.java

@@ -36,4 +36,5 @@ public class OrderTicketsListDao {
     String userMobile;
     String orderType;
     String orderSource;
+    String createdAt;
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -24,6 +24,7 @@
         <result column="user_name" property="userName"/>
         <result column="user_mobile" property="userMobile"/>
         <result column="order_type" property="orderType"/>
+        <result column="created_at" property="createdAt"/>
     </resultMap>
 
     <resultMap id="orderPushDamaiDto" type="com.liquidnet.service.kylin.dao.OrderPushDamaiDto">
@@ -110,7 +111,8 @@
         kot.user_id,
         kot.user_name,
         kot.user_mobile,
-        kot.order_type
+        kot.order_type,
+        date_format(kot.created_at,  '%Y-%m-%d %H:%i:%s') created_at
         FROM kylin_order_tickets kot
         inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
         inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
@@ -160,6 +162,7 @@
                 AND kots.status = #{orderStatus}
             </if>
         </where>
+        order by kot.created_at desc
         <!--        <if test="orderItem!=''">-->
         <!--            ORDER BY ${orderItem} ${orderSc}-->
         <!--        </if>-->