From 53b823e2b1444e33f359fba79f8ff1e078253891 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 14 十一月 2024 09:26:10 +0800
Subject: [PATCH] add:-商户列表需要增加下单次数统计(已退款、已取消、待付款的不统计在内)

---
 src/main/java/com/mzl/flower/service/flower/FlowerService.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerService.java b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
index 9cc9169..1d768ba 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -693,9 +693,10 @@
     public Page<FlowerShowListDTO> myCollect(Page page, FlowerShowQueryDTO dto) {
         dto.setUserId(SecurityUtils.getUserId());
         if (StringUtils.isNotEmpty(dto.getColumn())) {
-            if(dto.getColumn().contains("sales")
-                    || dto.getColumn().contains("stock")){
+            if(dto.getColumn().contains("stock")){
                 dto.setColumn(dto.getColumn() + " desc");
+            } else if (dto.getColumn().contains("sales")) {
+                dto.setColumn("ifnull(sales, 0) + ifnull(real_sales, 0) desc");
             }
         }
 
@@ -723,9 +724,9 @@
                 s.setCollection(s.getCollectCount() > 0);
                 s.setShopnum(s.getShopnum() == null ? 0 : s.getShopnum());
 
-                if(s.getSales() != null && s.getRealSales() != null){
+                /*if(s.getSales() != null && s.getRealSales() != null){
                     s.setSales(s.getSales() + s.getRealSales());
-                }
+                }*/
             }
         }
     }

--
Gitblit v1.9.3