diff --git a/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java b/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java index e5c2439f..f703d152 100644 --- a/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/UserMoneyDetailsController.java @@ -22,7 +22,7 @@ public class UserMoneyDetailsController { @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") public Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId, Long userId,Integer classify,Integer type, Integer moneyType) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type, moneyType); + return userMoneyDetailsService.queryUserMoneyDetails(page, limit, sysUserId, userId,classify,type, moneyType, 0); } @GetMapping("/selectUserMoney") diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java index f6dbfb26..940d49ba 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyDetailsController.java @@ -25,8 +25,9 @@ public class AppUserMoneyDetailsController { @Login @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") - public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify,Integer type, Integer moneyType) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type, moneyType); + public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute Long userId,Integer classify, + Integer type, Integer moneyType, Integer viewType) { + return userMoneyDetailsService.queryUserMoneyDetails(page, limit,null, userId,classify,type, moneyType ,viewType); } @Login diff --git a/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java b/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java index bfdc3a9e..34b160a9 100644 --- a/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java +++ b/src/main/java/com/sqx/modules/app/service/UserMoneyDetailsService.java @@ -7,7 +7,10 @@ import com.sqx.modules.app.entity.UserMoneyDetails; import java.util.Map; public interface UserMoneyDetailsService extends IService { - Result queryUserMoneyDetails(Integer page, Integer limit,Long sysUserId,Long userId,Integer classify,Integer type, Integer moneyType); - Double monthIncome(String date,Long userId); + Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify, + Integer type, Integer moneyType, Integer viewType); + + Double monthIncome(String date, Long userId); + Map queryUserTotalEarning(Long userId); } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java index a5951faa..fea124a4 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java @@ -10,6 +10,7 @@ import com.sqx.modules.app.entity.UserMoneyDetails; import com.sqx.modules.app.service.UserMoneyDetailsService; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -18,7 +19,8 @@ import java.util.Map; public class UserMoneyDetailsServiceImpl extends ServiceImpl implements UserMoneyDetailsService { @Override - public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify, Integer type, Integer moneyType) { + public Result queryUserMoneyDetails(Integer page, Integer limit, Long sysUserId, Long userId, Integer classify, + Integer type, Integer moneyType, Integer viewType) { IPage page1 = new Page(page, limit); QueryWrapper queryWrapper = new QueryWrapper(); if (sysUserId != null) { @@ -36,6 +38,13 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl arrayList = new ArrayList<>(); + arrayList.add(1); + arrayList.add(6); + arrayList.add(7); + queryWrapper.in("classify", arrayList); + } queryWrapper.orderByDesc("create_time"); return Result.success().put("data", baseMapper.selectPage(page1, queryWrapper)); } diff --git a/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java b/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java index e3c41017..b4fb3f04 100644 --- a/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java +++ b/src/main/java/com/sqx/modules/invite/controller/app/AppInviteController.java @@ -147,7 +147,7 @@ public class AppInviteController { @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId, Integer classify, Integer type, Integer moneyType) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type, moneyType); + return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, classify, type, moneyType, 0); } @GetMapping("/selectInviteAwardList") diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java index 2f1b2bd7..0174b4ae 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AppCashController.java @@ -74,7 +74,7 @@ public class AppCashController { @ApiOperation("钱包明细") @GetMapping("/queryUserMoneyDetails") public Result queryUserMoneyDetails(Integer page, Integer limit, @RequestAttribute("userId") Long userId, Integer classify, Integer type, Integer moneyType) { - return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, 2, type, moneyType); + return userMoneyDetailsService.queryUserMoneyDetails(page, limit, null, userId, classify, type, moneyType, 0); }