From 5a6261c2067609d3c840cbe1c8a2250fb31dea29 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 13 Nov 2025 17:22:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E5=90=8E=E5=8F=B0=E5=A4=A9=E5=8C=BB=E5=B8=81=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=B5=8B=E8=AF=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../peanut/modules/common/dao/UserCourseBuyDao.java | 2 ++ .../common/service/UserCourseBuyLogService.java | 6 ------ .../service/impl/UserCourseBuyLogServiceImpl.java | 13 ------------- .../master/controller/StatisticsController.java | 4 +--- .../master/service/UserCourseBuyService.java | 2 ++ .../service/impl/UserCourseBuyServiceImpl.java | 5 +++++ .../resources/mapper/master/UserCourseBuyDao.xml | 8 ++++++++ 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java b/src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java index 631ad436..de86a078 100644 --- a/src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java +++ b/src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java @@ -14,4 +14,6 @@ public interface UserCourseBuyDao extends MPJBaseMapper { List> getUserCourseBuyInfo(@Param("date") String date); List> getUserCourseBuyInfoTotal(@Param("date") String date); + + List> getIncome(@Param("date") String date); } diff --git a/src/main/java/com/peanut/modules/common/service/UserCourseBuyLogService.java b/src/main/java/com/peanut/modules/common/service/UserCourseBuyLogService.java index 8b84723b..2052054d 100644 --- a/src/main/java/com/peanut/modules/common/service/UserCourseBuyLogService.java +++ b/src/main/java/com/peanut/modules/common/service/UserCourseBuyLogService.java @@ -3,11 +3,5 @@ package com.peanut.modules.common.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.UserCourseBuyLog; -import java.util.List; -import java.util.Map; - public interface UserCourseBuyLogService extends IService { - - List> getIncome(String date); - } diff --git a/src/main/java/com/peanut/modules/common/service/impl/UserCourseBuyLogServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/UserCourseBuyLogServiceImpl.java index 18499231..057094d7 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/UserCourseBuyLogServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/UserCourseBuyLogServiceImpl.java @@ -1,26 +1,13 @@ package com.peanut.modules.common.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.modules.common.dao.UserCourseBuyLogDao; import com.peanut.modules.common.entity.UserCourseBuyLog; import com.peanut.modules.common.service.UserCourseBuyLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; - @Slf4j @Service("commonUserCourseBuyLogService") public class UserCourseBuyLogServiceImpl extends ServiceImpl implements UserCourseBuyLogService { - @Override - public List> getIncome(String date) { - return this.baseMapper.selectMaps(new MPJLambdaWrapper() - .select(UserCourseBuyLog::getPayType) - .selectSum(UserCourseBuyLog::getFee) - .apply("DATE_FORMAT(pay_time,'%Y-%m') = '"+date+"'") - .groupBy(UserCourseBuyLog::getPayType)); - } } diff --git a/src/main/java/com/peanut/modules/master/controller/StatisticsController.java b/src/main/java/com/peanut/modules/master/controller/StatisticsController.java index a101600e..a462c397 100644 --- a/src/main/java/com/peanut/modules/master/controller/StatisticsController.java +++ b/src/main/java/com/peanut/modules/master/controller/StatisticsController.java @@ -38,8 +38,6 @@ public class StatisticsController { @Autowired private UserCourseBuyService userCourseBuyService; @Autowired - private UserCourseBuyLogService userCourseBuyLogService; - @Autowired private TrainingClassService trainingClassService; @Autowired private TrainingToUserService trainingToUserService; @@ -260,7 +258,7 @@ public class StatisticsController { @RequestMapping("/getUserCourseBuyInfoTotal") public R getUserCourseBuyInfoTotal(@RequestBody Map params) { List> tanxiaoTotal = userCourseBuyService.getUserCourseBuyInfoTotal(params.get("date").toString()); - List> income = userCourseBuyLogService.getIncome(params.get("date").toString().substring(0,7)); + List> income = userCourseBuyService.getIncome(params.get("date").toString()); return R.ok().put("tanxiaoTotal", tanxiaoTotal).put("income", income); } diff --git a/src/main/java/com/peanut/modules/master/service/UserCourseBuyService.java b/src/main/java/com/peanut/modules/master/service/UserCourseBuyService.java index cea08cd6..d37ffc8f 100644 --- a/src/main/java/com/peanut/modules/master/service/UserCourseBuyService.java +++ b/src/main/java/com/peanut/modules/master/service/UserCourseBuyService.java @@ -22,6 +22,8 @@ public interface UserCourseBuyService extends IService { Map> addCourses(AddCourses addCourses); + List> getIncome(String date); + List> getUserCourseBuyInfoTotal(String date); List> getUserCourseBuyInfo(String date); diff --git a/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java index 8d763c47..29d196b9 100644 --- a/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java +++ b/src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java @@ -180,6 +180,11 @@ public class UserCourseBuyServiceImpl extends ServiceImpl> getIncome(String date) { + return this.baseMapper.getIncome(date); + } + @Override public List> getUserCourseBuyInfoTotal(String date) { return this.baseMapper.getUserCourseBuyInfoTotal(date); diff --git a/src/main/resources/mapper/master/UserCourseBuyDao.xml b/src/main/resources/mapper/master/UserCourseBuyDao.xml index 3635b7cc..54b465c0 100644 --- a/src/main/resources/mapper/master/UserCourseBuyDao.xml +++ b/src/main/resources/mapper/master/UserCourseBuyDao.xml @@ -37,6 +37,14 @@ ) t) s) q) w + +