From fa9350ed6a6cd221d1fde52675d68bbe1edc2a9c Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Tue, 25 Feb 2025 17:36:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/UserController.java | 7 ++++ .../java/com/sqx/modules/app/dao/UserDao.java | 3 +- .../app/response/HomeMessageResponse.java | 16 ++++++++++ .../sqx/modules/app/service/UserService.java | 3 ++ .../app/service/impl/UserServiceImpl.java | 32 +++++++++++++------ src/main/resources/mapper/app/UserDao.xml | 16 ++++++++++ 6 files changed, 67 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/UserController.java b/src/main/java/com/sqx/modules/app/controller/UserController.java index fd670778..2b3bf74d 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserController.java @@ -259,6 +259,13 @@ public class UserController { //设置本年收入 homeMessageResponse.setYearRevenue(userService.queryPayMoney(3, qdCode)); //查询指定日期下的短剧购买的 量 + + Map map = userService.queryPayAndExtractInfo(); + homeMessageResponse.setTodayPayAmount(map.get("payAmount") == null ? BigDecimal.ZERO :new BigDecimal(map.get("payAmount").toString())); + homeMessageResponse.setTodayPayCount(map.get("payCount") == null ? 0 : Integer.parseInt(map.get("payCount").toString())); + homeMessageResponse.setTodayExtractAmount(map.get("extractAmount") == null ? BigDecimal.ZERO : new BigDecimal(map.get("extractAmount").toString())); + homeMessageResponse.setTodayExtractCount(map.get("extractCount") == null ? 0 : Integer.parseInt(map.get("extractCount").toString())); + return Result.success().put("data", homeMessageResponse); } diff --git a/src/main/java/com/sqx/modules/app/dao/UserDao.java b/src/main/java/com/sqx/modules/app/dao/UserDao.java index ecee4a39..7d346394 100644 --- a/src/main/java/com/sqx/modules/app/dao/UserDao.java +++ b/src/main/java/com/sqx/modules/app/dao/UserDao.java @@ -42,5 +42,6 @@ public interface UserDao extends BaseMapper { int updateUserClientIdIsNull(String clientid); - + Map queryPayInfo(@Param("start") String start, @Param("end") String end); + Map queryExtractInfo(@Param("start") String start, @Param("end") String end); } diff --git a/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java b/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java index fa1d58c9..40ff6356 100644 --- a/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java +++ b/src/main/java/com/sqx/modules/app/response/HomeMessageResponse.java @@ -48,5 +48,21 @@ public class HomeMessageResponse implements Serializable { * 本年收入 */ private Double yearRevenue; + /** + * 当日总支付金额 + */ + private BigDecimal todayPayAmount; + /** + * 当日总支付笔数 + */ + private Integer todayPayCount; + /** + * 当日提现金额 + */ + private BigDecimal todayExtractAmount; + /** + * 当日提现笔数 + */ + private Integer todayExtractCount; } diff --git a/src/main/java/com/sqx/modules/app/service/UserService.java b/src/main/java/com/sqx/modules/app/service/UserService.java index 87ac2de1..2cf1dd86 100644 --- a/src/main/java/com/sqx/modules/app/service/UserService.java +++ b/src/main/java/com/sqx/modules/app/service/UserService.java @@ -10,6 +10,7 @@ import com.sqx.modules.app.entity.UserEntity; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * 用户 @@ -235,4 +236,6 @@ public interface UserService extends IService { Result updateUserInviteAmount(UserInviteDTO userInviteDTO); Result removeUserBlack(Long userId); + + Map queryPayAndExtractInfo(); } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 6d484e4b..a4768538 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -117,28 +117,22 @@ public class UserServiceImpl extends ServiceImpl implements @Autowired private MessageService messageService; @Autowired - private CommonInfoService commonRepository; - @Autowired - private DiscSpinningService discSpinningService; - @Autowired private SysUserService sysUserService; @Autowired private TbUserBlacklistMapper tbUserBlacklistMapper; - private final AliService aliService; + @Autowired + private UserDao userDao; private final UserInfoService userInfoService; private final UserVipDao userVipDao; - private final InviteAchievementService inviteAchievementService; private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(true); @Autowired private CourseDao courseDao; - public UserServiceImpl(@Lazy AliService aliService, UserInfoService userInfoService, UserVipDao userVipDao, InviteAchievementService inviteAchievementService) { - this.aliService = aliService; + public UserServiceImpl(UserInfoService userInfoService, UserVipDao userVipDao, InviteAchievementService inviteAchievementService) { this.userInfoService = userInfoService; this.userVipDao = userVipDao; - this.inviteAchievementService = inviteAchievementService; } @Override @@ -1795,4 +1789,24 @@ public class UserServiceImpl extends ServiceImpl implements } return Result.success("解除拉黑成功"); } + + @Override + public Map queryPayAndExtractInfo() { + Date date = new Date(); + DateTime beginOfDay = DateUtil.beginOfDay(date); + DateTime endOfDay = DateUtil.endOfDay(date); + + String begin = DateUtil.format(beginOfDay, "yyyy-MM-dd HH:mm:ss"); + String end = DateUtil.format(endOfDay, "yyyy-MM-dd HH:mm:ss"); + Map payInfo = userDao.queryPayInfo(begin, end); + Map extractInfo = userDao.queryExtractInfo(begin, end); + + Map result = new HashMap<>(); + result.put("payAmount", payInfo.get("totalMoney")); + result.put("payCount", payInfo.get("totalCount")); + result.put("extractAmount", extractInfo.get("totalMoney")); + result.put("extractCount", extractInfo.get("totalCount")); + + return result; + } } diff --git a/src/main/resources/mapper/app/UserDao.xml b/src/main/resources/mapper/app/UserDao.xml index f34ca9f7..20524394 100644 --- a/src/main/resources/mapper/app/UserDao.xml +++ b/src/main/resources/mapper/app/UserDao.xml @@ -313,5 +313,21 @@ where clientid = #{clientid} + + + +