From db7f51b20a98d58110db9d38b30caa95f0cbd21d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 17 四月 2021 18:05:43 +0800
Subject: [PATCH] Default Changelist

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 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 1f6f16c..802fcab 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
@@ -36,24 +36,14 @@
     IPage<ComShopOrderPageVO> pageOrderList(Page page,@Param("comOrderListDTO") PageComOrderListDTO comOrderListDTO);
 
     @Select("<script> " +
-            "SELECT\n" +
-            "id,\n" +
-            "`name`,\n" +
-            "photo_path,\n" +
-            "phone,\n" +
-            "integral,\n" +
-            "create_at \n" +
-            "FROM\n" +
-            "com_mng_volunteer_mng \n" +
-            " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
-            "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>" +
-            " and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" +
-            " </if> " +
-            "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>" +
-            "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +
-            " </if> " +
-            " order by integral desc,create_at desc"+
+            "SELECT   ordr.id, ordr.store_id, ordr. user_id, ordr.order_no, ordr.pay_no, \n" +
+            "    ordr.wx_tarde_no, ordr.status, ordr.pay_status, ordr.receiver_id, \n" +
+            "    ordr.total_amount, ordr.discount_amount, ordr.pay_amount, ordr.pay_type,  \n" +
+            "    ordr.pay_time, ordr.delivery_type, ordr.delivery_status, ordr.logistics_company, \n" +
+            "    ordr.logistics_no, ordr.create_at  \n" +
+            " FROM  com_shop_order ordr LEFT JOIN com_shop_order_goods goods ON ordr.id = goods.order_id \n" +
+            " order by create_at desc"+
             "</script>")
-    IPage<ComShopOrderVO> pageOrderBy(PageDTO page, PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+    IPage<ComShopOrderVO> pageOrderBy(PageDTO page,@Param("pageComShopOrderSearchDTO")  PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
 
 }

--
Gitblit v1.7.1