From 40c6bb2a4e15f3c2a5a72f3842404b49a25d4be8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 10:47:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
index 74dfa41..d0e3357 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -38,7 +38,7 @@
" sr.wx_tarde_no, sr.status, sr.pay_status, sr.receiver_id, \n" +
" sr.total_amount, sr.discount_amount, sr.pay_amount, sr.pay_type, \n" +
" sr.pay_time, sr.delivery_type, sr.delivery_status, sr.logistics_company, \n" +
- " sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone, group_concat(og.goods_name) as goodsName \n" +
+ " sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone, group_concat(og.goods_name) as goodsName, ss.name as store_name \n" +
" FROM com_shop_order sr LEFT JOIN com_shop_order_goods og ON sr.id = og.order_id \n" +
" LEFT JOIN com_shop_goods_attr ga ON og.goods_attr_id = ga.id \n" +
" LEFT JOIN sys_user su ON sr.user_id = su.user_id \n" +
@@ -82,7 +82,7 @@
" AND ss.sys_user_id = #{pageComShopOrderSearchDTO.storeUserId} " +
" </if> " +
" GROUP BY sr.id " +
- " ORDER BY sr.create_at "+
+ " ORDER BY sr.create_at DESC "+
"</script>")
IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
@@ -232,7 +232,7 @@
"<if test='pageComShopFundsSearchDTO.orderNo != null '>" +
" AND sr.order_no = #{pageComShopFundsSearchDTO.orderNo} " +
" </if> " +
- " GROUP BY sr.id ORDER BY sr.create_at "+
+ " GROUP BY sr.id ORDER BY sr.create_at DESC "+
"</script>")
IPage<ComShopFundsOrderVO> pageShopFunds(Page page, @Param("pageComShopFundsSearchDTO") PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
--
Gitblit v1.7.1