From 77bd80eadf1d3b973f640b8e7d9b630d14afb2d8 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 15:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 1c05e3a..cf35981 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
@@ -75,6 +75,12 @@
"<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 "+
"</script>")
@@ -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 " +
--
Gitblit v1.7.1