From be2d7ec232fbd22b5e46ec133485ea751520636d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 22 四月 2021 09:47:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 904a96e..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
@@ -24,7 +24,7 @@
public interface ComShopOrderDAO extends BaseMapper<ComShopOrderDO> {
@Select("<script> " +
- "select order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" +
+ "select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" +
" where 1=1 and cso.delete_status = 1 and cso.user_id = #{comOrderListDTO.userId}" +
"<if test='comOrderListDTO.status != null'>" +
" AND cso.status = #{comOrderListDTO.status} " +
@@ -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" +
@@ -75,8 +75,14 @@
"<if test='pageComShopOrderSearchDTO.storeName != null '>" +
" AND ss.name like concat('%', #{pageComShopOrderSearchDTO.storeName}, '%') " +
" </if> " +
+ "<if test='pageComShopOrderSearchDTO.storeId != null '>" +
+ " AND ss.id = #{pageComShopOrderSearchDTO.storeId} " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.storeUserId != null '>" +
+ " 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);
@@ -102,7 +108,10 @@
" LEFT JOIN com_shop_store ss ON sr.store_id = ss.id \n" +
" WHERE sr.delete_status = 1" +
"<if test='comShopOrderExportDTO.userId != null'>" +
- " AND ss.user_id = #{comShopOrderExportDTO.userId} " +
+ " AND sr.user_id = #{comShopOrderExportDTO.userId} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.storeUserId != null '>" +
+ " AND ss.sys_user_id = #{comShopOrderExportDTO.storeUserId} " +
" </if> " +
"<if test='comShopOrderExportDTO.orderIds != null and comShopOrderExportDTO.orderIds.length>0 '>" +
" AND sr.id in " +
@@ -180,7 +189,7 @@
"SELECT ss.sys_user_id, sum(sr.pay_amount) AS t , DATE_FORMAT(sr.pay_time,'%Y%m%d') days\n" +
"FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
"WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%m%d') = DATE_FORMAT(NOW(),'%Y%m%d')\n" +
- "<if test='userId!=null'>" +
+ "<if test='userId!=null and userId!=0L'>" +
" and ss.sys_user_id = #{userId}\n" +
"</if>" +
"GROUP BY days\n" +
@@ -188,7 +197,7 @@
"SELECT ss.sys_user_id, sum(sr.pay_amount) AS t, DATE_FORMAT(sr.pay_time,'%Y%u') weeks\n" +
"FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
"WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%u') = DATE_FORMAT(NOW(),'%Y%u')\n" +
- "<if test='userId!=null'>" +
+ "<if test='userId!=null and userId!=0L'>" +
" and ss.sys_user_id = #{userId}\n" +
"</if>" +
"GROUP BY weeks\n" +
@@ -196,7 +205,7 @@
"SELECT ss.sys_user_id, sum(sr.pay_amount) AS t, DATE_FORMAT(sr.pay_time,'%Y%m') months\n" +
"FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
"WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%m') = DATE_FORMAT(NOW(),'%Y%m')\n" +
- "<if test='userId!=null'>" +
+ "<if test='userId!=null and userId!=0L'>" +
" and ss.sys_user_id = #{userId}\n" +
"</if>" +
"GROUP BY months\n" +
@@ -223,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