From 37c06df9437254f5821fd372e10d13a52fa1041c Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 22:16:21 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7c3583f..74dfa41 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} " +
@@ -189,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" +
@@ -197,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" +
@@ -205,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" +
--
Gitblit v1.7.1