From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 d0e3357..a026086 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
@@ -55,16 +55,16 @@
" AND sr.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
" </if> " +
"<if test='pageComShopOrderSearchDTO.orderNo != null '>" +
- " AND sr.order_no = #{pageComShopOrderSearchDTO.orderNo} " +
+ " AND sr.order_no like concat('%', #{pageComShopOrderSearchDTO.orderNo}, '%') " +
" </if> " +
"<if test='pageComShopOrderSearchDTO.userAccount != null '>" +
- " AND su.phone = #{pageComShopOrderSearchDTO.userAccount} " +
+ " AND su.phone like concat('%', #{pageComShopOrderSearchDTO.userAccount}, '%') " +
" </if> " +
"<if test='pageComShopOrderSearchDTO.receiverAccount != null '>" +
- " AND uad.name = #{pageComShopOrderSearchDTO.receiverAccount} " +
+ " AND uad.name like concat('%', #{pageComShopOrderSearchDTO.receiverAccount}, '%') " +
" </if> " +
"<if test='pageComShopOrderSearchDTO.receiverPhone != null '>" +
- " AND uad.phone = #{pageComShopOrderSearchDTO.receiverPhone} " +
+ " AND uad.phone like concat('%',#{pageComShopOrderSearchDTO.receiverPhone}, '%') " +
" </if> " +
"<if test='pageComShopOrderSearchDTO.goodsName != null'>" +
" AND og.goods_name like concat('%', #{pageComShopOrderSearchDTO.goodsName}, '%') " +
@@ -87,7 +87,7 @@
IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
@Select("<script> " +
- "SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name) AS goods_name , count(og.id) AS goods_count, " +
+ "SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name separator '\n') AS goods_name , sum(og.amount) AS goods_count, " +
" su.phone AS account, uad.name AS receiver, uad.phone AS receiverPhone, \n" +
" concat(uad.province_name, uad.city_name, uad.district_name, uad.detail_address) AS receiver_address, ss.name AS storeName, sr.remark," +
" CASE\n" +
@@ -176,7 +176,7 @@
" AND sr.order_no = #{comShopFundsExportDTO.orderNo} " +
" </if> " +
" </if> " +
- " GROUP BY sr.id ORDER BY sr.create_at "+
+ " GROUP BY sr.id ORDER BY sr.create_at DESC "+
"</script>")
IPage<ExcelShopFundsDTO> selectFundsExport(Page page, @Param("comShopFundsExportDTO") ComShopFundsExportDTO comShopFundsExportDTO);
--
Gitblit v1.7.1