From 670a5fbf179ede82e6f2cb1a4b8bf920a0dbf2de Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Mon, 23 Dec 2024 17:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/mapper/ConsumeMapper.java   |  8 ++++----
 .../java/com/example/demo/mapper/DetailYMapper.java   | 19 +++++++++----------
 .../example/demo/serviceImpl/DetailYServiceImpl.java  |  5 +----
 .../java/com/example/demo/sevice/DetailYService.java  |  5 +----
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
index f028ab8..6de6c8b 100644
--- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java
+++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
@@ -42,11 +42,11 @@ public interface ConsumeMapper {
     @Select({
             "<script>",
             "select detail_y.*,admin.name  as adminName ,admin.area as area ,user.name as userName,product.name as productName from detail_y ",
-            "inner join admin on detail_y.admin_id=admin.admin_id ",
-            "inner join user on detail_y.jwcode= user.jwcode ",
-            "inner join product on detail_y.product_id= product.product_id ",
+            "Left join admin on detail_y.admin_id=admin.admin_id ",
+            "Left join user on detail_y.jwcode= user.jwcode ",
+            "Left join product on detail_y.product_id= product.product_id ",
             "<where>",
-            "`detail_flag`=1 AND update_type = '1'",
+//            "`detail_flag`=1 AND update_type = '1'",
             "<if test='jwcode!=null'>and detail.jwcode =#{jwcode}</if>",
             "<if test='productName!=null'>and product.name like concat('%',#{productName},'%')</if>",
             "<if test='consumePlatform!=null'>and detail_y.consume_platform like concat('%',#{consumePlatform},'%')</if>",
diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java
index 94ddd47..eb68b20 100644
--- a/src/main/java/com/example/demo/mapper/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java
@@ -48,18 +48,17 @@ public interface DetailYMapper {
     @Select({
             "<script>",
             "SELECT",
-                    "  SUM(`recharge_coin`) AS 'sumR',",
-                    "  SUM(`task_coin`) AS 'sumT',",
-                    "  SUM(`free_coin`) AS 'sumF'",
-                    "FROM",
-                    "`detail_y`",
+            "  SUM(`recharge_coin`) AS 'sumR',",
+            "  SUM(`task_coin`) AS 'sumT',",
+            "  SUM(`free_coin`) AS 'sumF'",
+            "FROM",
+            "`detail_y`",
             "<where>",
-            "<if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode=#{jwcode}</if>",
-            "<if test='updateType!=null'>and update_type=#{updateType}</if>",
-            "<if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>",
+            "<if test='jwcode!=null and jwcode.length>0'>AND jwcode=#{jwcode}</if>",
+            "<if test='updateType!=null'>AND update_type=#{updateType}</if>",
+            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "</where>",
             "</script>"
-
     })
-    int getCount(DetailY detailY);
+    DetailY getCount(DetailY detailY);
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
index 58aece8..15d46a0 100644
--- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
@@ -1,14 +1,11 @@
 package com.example.demo.serviceImpl;
 
-import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.DetailY;
-import com.example.demo.mapper.DetailMapper;
 import com.example.demo.mapper.DetailYMapper;
 import com.example.demo.sevice.DetailYService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -30,7 +27,7 @@ public class DetailYServiceImpl implements DetailYService {
     }
 
     @Override
-    public int getCount(DetailY detailY) {
+    public DetailY getCount(DetailY detailY) {
         return detailYMapper.getCount(detailY);
     }
 
diff --git a/src/main/java/com/example/demo/sevice/DetailYService.java b/src/main/java/com/example/demo/sevice/DetailYService.java
index 5829824..f85bca3 100644
--- a/src/main/java/com/example/demo/sevice/DetailYService.java
+++ b/src/main/java/com/example/demo/sevice/DetailYService.java
@@ -1,13 +1,10 @@
 package com.example.demo.sevice;
 
-import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.DetailY;
 import com.github.pagehelper.PageInfo;
 
-import java.util.List;
-
 public interface DetailYService {
     int add(DetailY detailY);
-    int getCount(DetailY detailY);
+    DetailY getCount(DetailY detailY);
     PageInfo<DetailY> getDetailByPage(int pageNum, int pageSize, DetailY detailY);
 }