From c27c1f2beb4ca89a94eaa854fce6b4553db8f2f8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:58:12 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 1245 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 955 insertions(+), 290 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index c6565e7..01a39c9 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,39 +1,72 @@
package com.ruoyi.account.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.api.model.UserSignRecord;
+import com.ruoyi.account.mapper.AppUserMapper;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.account.service.UserSignRecordService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.model.*;
+import com.ruoyi.account.dto.DangerInfoDto;
+import com.ruoyi.account.service.*;
+import com.ruoyi.account.util.ObsUploadUtil;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.redis.annotation.DistributedLock;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.feignClient.OrderClient;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.model.Order;
import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.factory.ShopBalanceStatementClientFallbackFactory;
+import com.ruoyi.other.api.feignClient.ShopBalanceStatementClient;
+import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.feignClient.StoreClient;
+import com.ruoyi.other.api.feignClient.VipSettingClient;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.io.IOException;
+import java.math.BigDecimal;
import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -45,323 +78,955 @@
public class AppUserController extends BaseController {
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserService appUserService;
+ @Resource
+ private StoreClient storeClient;
+ @Resource
+ private UserCouponService userCouponService;
- @Resource
- private TokenService tokenService;
- @Resource
- private AppUserService appUserService;
- @Resource
- private StoreClient storeClient;
- @Resource
- private UserCouponService userCouponService;
-
- @Resource
- private UserSignRecordService userSignRecordService;
+ @Resource
+ private UserSignRecordService userSignRecordService;
+ @Resource
+ private VipSettingClient vipSettingClient;
+ @Resource
+ private UserPointService userPointService;
+ @Resource
+ private VipSettingService vipSettingService;
+ @Resource
+ private AppUserMapper appUserMapper;
+ @Resource
+ private ShopClient shopClient;
+ @Resource
+ private RemoteOrderGoodsClient remoteOrderGoodsClient;
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private OrderClient orderClient;
+ @Resource
+ private ShopBalanceStatementClient shopBalanceStatementClient;
+ @Resource
+ private UserCancellationLogService userCancellationLogService;
+ @Resource
+ private BalanceChangeRecordService balanceChangeRecordService;
- @ResponseBody
- @PostMapping("/mobileLogin")
- @ApiOperation(value = "手机号登录")
- public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
- return appUserService.mobileLogin(mobileLogin);
- }
+ @ResponseBody
+ @PostMapping("/mobileLogin")
+ @ApiOperation(value = "手机号登录")
+ public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin) {
+ return appUserService.mobileLogin(mobileLogin);
+ }
- @ResponseBody
- @PostMapping("/appletLogin")
- @ApiOperation(value = "小程序一键登录")
- public R<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
- return appUserService.appletLogin(appletLogin);
- }
-
-
- @ResponseBody
- @PostMapping("/getAppUserById")
- public AppUser getAppUserById(@RequestParam("id") Long id){
- return appUserService.getById(id);
- }
-
- @ResponseBody
- @PostMapping("/editAppUserById")
- public R<Void> editAppUserById(@RequestBody AppUser appUser) {
- appUserService.updateById(appUser);
- return R.ok();
-
- }
-
- @ResponseBody
- @PostMapping("/getTopUsers")
- public R<List<AppUser>> getTopUsers(@RequestBody AppUser appUser) {
- List<Integer> vipIds = new ArrayList<>();
- vipIds.add(5);
- vipIds.add(6);
- vipIds.add(7);
- List<AppUser> list = appUserService.lambdaQuery().in(AppUser::getVipId, vipIds).list();
- return R.ok(list);
-
- }
-
- @ResponseBody
- @PostMapping("/getCouponCount")
- public R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId ){
- Long count = userCouponService.lambdaQuery().eq(UserCoupon::getAppUserId, userId).eq(UserCoupon::getCouponId, couponId).count();
- return R.ok(count);
- }
-
- @ResponseBody
- @PostMapping("/getVipCount")
- public R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId ){
- Long count = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, userId).eq(AppUser::getVipId, vipId).count();
- return R.ok(count);
- }
+ @ResponseBody
+ @PostMapping("/appletLogin")
+ @ApiOperation(value = "小程序一键登录")
+ public R<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin) {
+ return appUserService.appletLogin(appletLogin);
+ }
-
-
- @ResponseBody
- @PostMapping("/getSMSCode")
- @ApiOperation(value = "获取短信验证码")
- public R getSMSCode(@RequestBody SMSCode smsCode){
- return appUserService.getSMSCode(smsCode);
- }
+ @PostMapping("/getAppUserById")
+ public AppUser getAppUserById(@RequestParam("id") Long id) {
+ return appUserService.getById(id);
+ }
+
+ @ResponseBody
+ @PostMapping("/editAppUserById")
+ public R<Void> editAppUserById(@RequestBody AppUser appUser) {
+ appUserService.updateById(appUser);
+ appUserService.update(new LambdaUpdateWrapper<AppUser>().eq(AppUser::getId, appUser.getId())
+ .set(AppUser::getLastShopTime, appUser.getLastShopTime()));
+ return R.ok();
+
+ }
+
+ @ResponseBody
+ @PostMapping("/getTopUsers")
+ public R<List<AppUser>> getTopUsers(@RequestBody AppUser appUser) {
+ List<Integer> vipIds = new ArrayList<>();
+ vipIds.add(5);
+ vipIds.add(6);
+ vipIds.add(7);
+ List<AppUser> list = appUserService.lambdaQuery().in(AppUser::getVipId, vipIds).list();
+ return R.ok(list);
+
+ }
+
+ @ResponseBody
+ @PostMapping("/getCouponCount")
+ public R<Long> getCouponCount(@RequestParam("userId") Long userId, @RequestParam("couponId") Integer couponId) {
+ LambdaQueryChainWrapper<UserCoupon> chainWrapper = userCouponService.lambdaQuery().eq(UserCoupon::getCouponId, couponId);
+ if(null != userId && -1 == userId){
+ chainWrapper.eq(UserCoupon::getAppUserId, userId);
+ }
+ Long count = chainWrapper.count();
+ return R.ok(count);
+ }
+
+ @ResponseBody
+ @PostMapping("/getVipCount")
+ public R<Long> getVipCount(@RequestParam("userId") Long userId, @RequestParam("vipId") Integer vipId) {
+ Long count = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, userId).eq(AppUser::getVipId, vipId).count();
+ return R.ok(count);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/getSMSCode")
+ @ApiOperation(value = "获取短信验证码")
+ public R getSMSCode(@RequestBody SMSCode smsCode) {
+ return appUserService.getSMSCode(smsCode);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/registerAccount")
+ @ApiOperation(value = "注册新账号")
+ public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount) {
+ return appUserService.registerAccount(registerAccount);
+ }
+
+
+ @ResponseBody
+ @GetMapping("/getReferrer/{id}")
+ @ApiOperation(value = "获取推荐人信息")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
+ })
+ public R<String> getReferrer(@PathVariable("id") Long id) {
+ AppUser appUser = appUserService.getById(id);
+ String phone = appUser.getPhone();
+ phone = phone.substring(0, 3) + "****" + phone.substring(7);
+ return R.ok(appUser.getName() + "-" + phone);
+ }
+
+
+ @ResponseBody
+ @GetMapping("/getNearbyReferrer")
+ @ApiOperation(value = "获取附近推荐人列表")
+ public R<PageInfo<NearbyReferrerVo>> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
+ return R.ok(appUserService.getNearbyReferrer(nearbyReferrer));
+ }
+
+
+ @ResponseBody
+ @PostMapping("/info")
+ @ApiOperation(value = "我的资料", tags = {"小程序-个人中心首页-我的资料"})
+ public R<AppUser> info() {
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ AppUser user = appUserService.getById(userId);
+ return R.ok(user);
+ }
- @ResponseBody
- @PostMapping("/registerAccount")
- @ApiOperation(value = "注册新账号")
- public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
- return appUserService.registerAccount(registerAccount);
- }
+ @ResponseBody
+ @GetMapping("/unregis")
+ @ApiOperation(value = "注销", tags = {"小程序-个人中心首页-我的资料"})
+ public R unregis() {
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ AppUser user = appUserService.getById(userId);
+
+ //添加注销记录
+ UserCancellationLog userCancellationLog = new UserCancellationLog();
+ userCancellationLog.setAppUserId(user.getId());
+ userCancellationLog.setVipId(user.getVipId());
+ userCancellationLogService.save(userCancellationLog);
+ user.setStatus(3);
+ appUserService.updateById(user);
+
+ List<AppUser> subUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getInviteUserId, userId));
+ for (AppUser appUser : subUserList) {
+ Long inviteUserId = user.getInviteUserId();
+ appUser.setInviteUserId(inviteUserId);
+ }
+ appUserService.updateBatchById(subUserList);
+ return R.ok();
+ }
- @ResponseBody
- @GetMapping("/getReferrer/{id}")
- @ApiOperation(value = "获取推荐人信息")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
- })
- public R<String> getReferrer(@PathVariable("id") Long id){
- AppUser appUser = appUserService.getById(id);
- String phone = appUser.getPhone();
- phone = phone.substring(0, 3) + "****" + phone.substring(7);
- return R.ok(appUser.getName() + "-" + phone);
- }
+ @ResponseBody
+ @GetMapping("/recommend")
+ @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
+ public R<AppUser> recommend() {
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ //获取绑定门店
+ AppUser user = appUserService.getById(userId);
+ if (user.getShopId() != null) {
+ R<Shop> storeById = storeClient.getStoreById(user.getShopId());
+ if (storeById.getData() != null) {
+ user.setShopName(storeById.getData().getName());
+ user.setShopCover(storeById.getData().getHomePicture());
+ user.setShopAddress(storeById.getData().getAddress());
+ }
+ }
+ //获取绑定上级
+ if (user.getInviteUserId() != null) {
+ AppUser byId = appUserService.getById(user.getInviteUserId());
+ user.setTopUser(byId);
+ }
+ //获取绑定下级列表
+ List<AppUser> list = appUserService.lambdaQuery()
+ .eq(AppUser::getInviteUserId, user.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .list();
+ for (AppUser appUser : list) {
+ Long count1 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 1)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count2 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 2)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count3 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 3)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count4 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 4)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count5 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 5)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count6 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 6)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ Long count7 = appUserService.lambdaQuery()
+ .eq(AppUser::getVipId, 7)
+ .eq(AppUser::getInviteUserId, appUser.getId())
+ .eq(AppUser::getDelFlag, 0)
+ .ne(AppUser::getStatus, 3)
+ .count();
+ appUser.setCount1(count1);
+ appUser.setCount2(count2);
+ appUser.setCount3(count3);
+ appUser.setCount4(count4);
+ appUser.setCount5(count5);
+ appUser.setCount6(count6);
+ appUser.setCount7(count7);
+ }
+ user.setBottomUsers(list);
+ return R.ok(user);
+ }
- @ResponseBody
- @GetMapping("/getNearbyReferrer")
- @ApiOperation(value = "获取附近推荐人列表")
- public TableDataInfo<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer){
- startPage();
- List<NearbyReferrerVo> list = appUserService.getNearbyReferrer(nearbyReferrer);
- return getDataTable(list);
- }
-
-
- @ResponseBody
- @PostMapping("/info")
- @ApiOperation(value = "我的资料", tags = {"小程序-个人中心首页-我的资料"})
- public R<AppUser> info(){
- Long userId = tokenService.getLoginUserApplet().getUserid();
- AppUser user = appUserService.getById(userId);
-
-
-
- return R.ok(user);
- }
- @Resource
- private UserCancellationLogService userCancellationLogService;
-
- @ResponseBody
- @GetMapping("/unregis")
- @ApiOperation(value = "注销", tags = {"小程序-个人中心首页-我的资料"})
- public R unregis(){
- Long userId = tokenService.getLoginUserApplet().getUserid();
- AppUser user = appUserService.getById(userId);
-
- //添加注销记录
- UserCancellationLog userCancellationLog = new UserCancellationLog();
- userCancellationLog.setAppUserId(user.getId());
- userCancellationLog.setVipId(user.getVipId());
- userCancellationLogService.save(userCancellationLog);
-
-
- return R.ok();
- }
-
-
-
- @ResponseBody
- @GetMapping("/recommend")
- @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
- public R<AppUser> recommend(){
- Long userId = tokenService.getLoginUserApplet().getUserid();
- //获取绑定门店
- AppUser user = appUserService.getById(userId);
- if (user.getShopId()!=null){
- R<Shop> storeById = storeClient.getStoreById(user.getShopId());
- if (storeById.getData()!=null){
- user.setShopName(storeById.getData().getName());
- user.setShopCover(storeById.getData().getHomePicture());
- user.setShopAddress(storeById.getData().getAddress());
- }
- }
-
- //获取绑定上级
- if (user.getInviteUserId()!=null) {
- AppUser byId = appUserService.getById(user.getInviteUserId());
- user.setTopUser(byId);
- }
- //获取绑定下级列表
- List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, user.getInviteUserId()).list();
- for (AppUser appUser : list) {
- Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getTopInviteId, 1).count();
- Long count2 = appUserService.lambdaQuery().eq(AppUser::getVipId, 2).eq(AppUser::getTopInviteId, userId).count();
- Long count3 = appUserService.lambdaQuery().eq(AppUser::getVipId, 3).eq(AppUser::getTopInviteId, userId).count();
- Long count4 = appUserService.lambdaQuery().eq(AppUser::getVipId, 4).eq(AppUser::getTopInviteId, userId).count();
- Long count5 = appUserService.lambdaQuery().eq(AppUser::getVipId, 5).eq(AppUser::getTopInviteId, userId).count();
- Long count6 = appUserService.lambdaQuery().eq(AppUser::getVipId, 6).eq(AppUser::getTopInviteId, userId).count();
- Long count7 = appUserService.lambdaQuery().eq(AppUser::getVipId, 7).eq(AppUser::getTopInviteId, userId).count();
- appUser.setCount1(count1);
- appUser.setCount2(count2);
- appUser.setCount3(count3);
- appUser.setCount4(count4);
- appUser.setCount5(count5);
- appUser.setCount6(count6);
- appUser.setCount7(count7);
- }
- user.setBottomUsers(list);
-
- return R.ok(user);
- }
-
- @ResponseBody
- @GetMapping("/change")
- @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
- public R<AppUser> change(@ApiParam("换绑用户手机号") String phone){
- Long userId1 = tokenService.getLoginUserApplet().getUserid();
+ @ResponseBody
+ @GetMapping("/change")
+ @ApiOperation(value = "推广中心", tags = {"小程序-推广中心"})
+ public R<AppUser> change(@ApiParam("换绑用户手机号") String phone) {
+ Long userId1 = tokenService.getLoginUserApplet().getUserid();
AppUser byId = appUserService.getById(userId1);
//获取绑定门店
- AppUser user = appUserService.lambdaQuery().eq(AppUser::getPhone,phone).one();
- if (user==null){
- return R.fail("当前手机号未注册");
- }
+ AppUser user = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
+ if (user == null) {
+ return R.fail("当前手机号未注册");
+ }
byId.setInviteUserId(user.getId());
- appUserService.updateById(byId);
- return R.ok();
- }
-
+ appUserService.updateById(byId);
+ return R.ok();
+ }
@GetMapping("/index")
- @ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
- public R<AppUser> index(){
- System.err.println("=-====");
+ @ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
+ public R<AppUser> index() {
Long userId = tokenService.getLoginUserApplet().getUserid();
- //当前用户信息
- AppUser user = appUserService.getById(userId);
- //当前用户的推荐人信息
- if (user.getInviteUserId()!=null){
- AppUser inviteUser = appUserService.getById(user.getInviteUserId());
- user.setInviteUserName(inviteUser.getName());
- }
- //当前绑定门店的店铺信息
- if (user.getShopId()!=null){
- R<Shop> storeById = storeClient.getStoreById(user.getShopId());
- if (storeById.getData()!=null){
- user.setShopName(storeById.getData().getName());
- }
- }
- Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getTopInviteId, 1).count();
- Long count2 = appUserService.lambdaQuery().eq(AppUser::getVipId, 2).eq(AppUser::getTopInviteId, userId).count();
- Long count3 = appUserService.lambdaQuery().eq(AppUser::getVipId, 3).eq(AppUser::getTopInviteId, userId).count();
- Long count4 = appUserService.lambdaQuery().eq(AppUser::getVipId, 4).eq(AppUser::getTopInviteId, userId).count();
- Long count5 = appUserService.lambdaQuery().eq(AppUser::getVipId, 5).eq(AppUser::getTopInviteId, userId).count();
- Long count6 = appUserService.lambdaQuery().eq(AppUser::getVipId, 6).eq(AppUser::getTopInviteId, userId).count();
- Long count7 = appUserService.lambdaQuery().eq(AppUser::getVipId, 7).eq(AppUser::getTopInviteId, userId).count();
- user.setCount1(count1);
- user.setCount2(count2);
- user.setCount3(count3);
- user.setCount4(count4);
- user.setCount5(count5);
- user.setCount6(count6);
- user.setCount7(count7);
+ //当前用户信息
+ AppUser user = appUserService.getById(userId);
+ //当前用户的推荐人信息
+ if (user.getInviteUserId() != null) {
+ AppUser inviteUser = appUserService.getById(user.getInviteUserId());
+ user.setInviteUserName(inviteUser.getName());
+ }
+ //当前绑定门店的店铺信息
+ if (user.getShopId() != null) {
+ R<Shop> storeById = shopClient.getShopById(user.getShopId());
+ if (storeById.getData() != null) {
+ Shop shop = storeById.getData();
+ user.setShopName(shop.getName());
+ }
+ }
+ List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .ne(AppUser::getStatus, 3)
+ .eq(AppUser::getDelFlag, 0));
+ ArrayList<Long> userIds = new ArrayList<>();
+ userIds.add(userId);
+ getUserAncestorList(user,userIds,new ArrayList<>(),appUserList);
+// Long count1 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+// Long count2 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+// Long count3 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+// Long count4 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 4).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+// Long count5 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 5).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+// Long count6 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 6).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+// Long count7 = appUserService.lambdaQuery().ne(AppUser::getStatus,3).eq(AppUser::getVipId, 7).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+// user.setCount1(count1);
+// user.setCount2(count2);
+// user.setCount3(count3);
+// user.setCount4(count4);
+// user.setCount5(count5);
+// user.setCount6(count6);
+// user.setCount7(count7);
- List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
- if (!list.isEmpty()){
+ List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now())
+ .eq(UserSignRecord::getAppUserId,userId).list();
+ if (!list.isEmpty()) {
user.setIsSign(1);
- }else {
+ } else {
user.setIsSign(0);
}
- return R.ok(user);
+ return R.ok(user);
+ }
+ public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> children,List<AppUser> list) {
+ children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(children)){
+ user.setCount1((user.getCount1() == null ? 0L : user.getCount1()) + children.stream().filter(e->e.getVipId() == 1).count());
+ user.setCount2((user.getCount2() == null ? 0L : user.getCount2()) + children.stream().filter(e->e.getVipId() == 2).count());
+ user.setCount3((user.getCount3() == null ? 0L : user.getCount3()) + children.stream().filter(e->e.getVipId() == 3).count());
+ user.setCount4((user.getCount4() == null ? 0L : user.getCount4()) + children.stream().filter(e->e.getVipId() == 4).count());
+ user.setCount5((user.getCount5() == null ? 0L : user.getCount5()) + children.stream().filter(e->e.getVipId() == 5).count());
+ user.setCount6((user.getCount6() == null ? 0L : user.getCount6()) + children.stream().filter(e->e.getVipId() == 6).count());
+ user.setCount7((user.getCount7() == null ? 0L : user.getCount7()) + children.stream().filter(e->e.getVipId() == 7).count());
+ List<Long> userIdList = children.stream().map(AppUser::getId).collect(Collectors.toList());
+ getUserAncestorList(user,userIdList, children,list);
+ }
+ }
+
+ @GetMapping("/index/change")
+ @ApiOperation(value = "修改个人资料", tags = {"小程序-个人中心首页"})
+ public R<AppUser> indexchange(String avatar, String name) {
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ //当前用户信息
+ AppUser user = appUserService.getById(userId);
+ user.setName(name);
+ user.setAvatar(avatar);
+ appUserService.updateById(user);
+ return R.ok();
+ }
+
+ /**
+ * 获取用户的祖籍列表
+ */
+ @GetMapping("/getUserAncestorList")
+ public R<List<AppUser>> getUserAncestorList(Long id) {
+ List<AppUser> list = appUserService.getUserAncestorList(id, null);
+ return R.ok(list);
+ }
+
+ /**
+ * 获取用户的直帮上级用户
+ */
+ @ResponseBody
+ @PostMapping("/getSuperiorLeader")
+ @ApiOperation(value = "获取用户的直帮上级用户")
+ public R<AppUser> getSuperiorLeader(@RequestParam("id") Long id) {
+ AppUser superiorLeader = appUserService.getSuperiorLeader(id);
+ return R.ok(superiorLeader);
+ }
- }
-
- @GetMapping("/index/change")
- @ApiOperation(value = "修改个人资料", tags = {"小程序-个人中心首页"})
- public R<AppUser> indexchange(String avatar,String name){
- Long userId = tokenService.getLoginUserApplet().getUserid();
- //当前用户信息
- AppUser user = appUserService.getById(userId);
- user.setName(name);
- user.setAvatar(avatar);
- appUserService.updateById(user);
- return R.ok();
- }
- /**
- * 获取用户的祖籍列表
- */
- @GetMapping("/getUserAncestorList")
- public R<List<AppUser>> getUserAncestorList(Long id){
- List<AppUser> list = appUserService.getUserAncestorList(id,null);
- return R.ok(list);
- }
-
- /**
- * 获取用户的直帮上级用户
- */
- @ResponseBody
- @PostMapping("/getSuperiorLeader")
- @ApiOperation(value = "获取用户的直帮上级用户")
- public R<AppUser> getSuperiorLeader(@RequestParam("id") Long id) {
- AppUser superiorLeader = appUserService.getSuperiorLeader(id);
- return R.ok(superiorLeader);
- }
-
-
-
- @ResponseBody
- @PostMapping("/onlineRecord")
- @ApiOperation(value = "10分钟定时任务调用，记录用户在线时长", tags = {"小程序-个人中心首页"})
- public R onlineRecord(){
- appUserService.onlineRecord();
- return R.ok();
- }
-
- /**
- * 获取用户列表
- */
- @GetMapping("/getAppuserPage")
- @ApiOperation(value = "用户列表", tags = {"管理后台"})
- public R<IPage<AppUser>> getAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
- @ApiParam("每一页数据大小") Integer pageSize,
- AppUser appUser)
- {
- IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser);
- return R.ok(appuserPage);
- }
+ @ResponseBody
+ @PostMapping("/onlineRecord")
+ @ApiOperation(value = "10分钟定时任务调用，记录用户在线时长", tags = {"小程序-个人中心首页"})
+ public R onlineRecord() {
+ appUserService.onlineRecord();
+ return R.ok();
+ }
- @GetMapping("/getAppUserByPhone")
- public R<AppUser> getAppUserByPhone(String phone){
- AppUser appUser = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
- return R.ok(appUser);
- }
+ /**
+ * 根据用户名称模糊搜索用户列表
+ *
+ * @param name
+ * @return
+ */
+ @PostMapping("/getAppUserByName")
+ public R<List<AppUser>> getAppUserByName(@RequestParam("name") String name) {
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .like(AppUser::getName, name));
+ return R.ok(list);
+ }
+
+ /**
+ * 根据用户电话模糊搜索用户列表
+ *
+ * @param phone
+ * @return
+ */
+ @PostMapping("/getAppUserByPhone")
+ public R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone) {
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ .like(AppUser::getPhone, phone));
+ return R.ok(list);
+ }
+
+ /**
+ * 获取用户列表
+ */
+ @GetMapping("/getAppuserPage")
+ @ApiOperation(value = "用户列表", tags = {"管理后台"})
+ public R<IPage<AppUser>> getAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ AppUser appUser) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Integer shopId = null;
+ Set<Long> userId = null;
+ if(sysUser.getRoleType() == 2){
+ shopId = sysUser.getObjectId();
+ userId = orderClient.getAppUserByShoppingShop(shopId).getData();
+ }
+ IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, appUser, shopId, userId);
+ for (AppUser record : appuserPage.getRecords()) {
+ if (record.getInviteUserId() != null) {
+ AppUser byId1 = appUserService.getById(record.getInviteUserId());
+ if (byId1!=null) {
+ record.setInviteUserName(byId1.getName());
+ }
+ }
+ if (record.getShopId()!=null){
+ R<Shop> shopById = shopClient.getShopById(record.getShopId());
+ if (shopById.getData()!=null){
+ record.setShopName(shopById.getData().getName());
+ }
+ }
+ }
+ return R.ok(appuserPage);
+ }
+
+ @GetMapping("/shop/getAppuserPage")
+ @ApiOperation(value = "用户列表", tags = {"门店后台"})
+ public R<IPage<AppUser>> shopGetAppuserPage(@ApiParam("页码") @RequestParam Integer pageCurr,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ AppUser appUser) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ R<SysUser> sysUserR = sysUserClient.getSysUser(userid);
+ SysUser sysUser = sysUserR.getData();
+
+ List<Long> userIds = new ArrayList<>();
+ userIds.add(-1L);
+ //获取在该本店下单的用户ids
+ Integer objectId = sysUser.getObjectId();
+ R<List<Order>> listR = remoteOrderGoodsClient.byShopId(objectId);
+ if (listR.getData()!=null){
+ for (Order datum : listR.getData()) {
+ userIds.add(datum.getAppUserId());
+ }
+ }
+ IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageCurr, pageSize, appUser, objectId, userIds);
+ return R.ok(appuserPage);
+ }
+
+
+ @GetMapping("/danger/info")
+ @ApiOperation(value = "用户列表-保级条件详情", tags = {"管理后台"})
+ public R<DangerInfoDto> dangerinfo(Long id) {
+ AppUser byId = appUserService.getById(id);
+ LocalDate now = LocalDate.now();
+ R<VipSetting> vipSetting = vipSettingClient.getVipSetting(byId.getVipId());
+ VipSetting data = vipSetting.getData();
+ DangerInfoDto dangerInfoDto = new DangerInfoDto();
+ BeanUtils.copyProperties(data, dangerInfoDto);
+ List<UserPoint> list1 = userPointService.lambdaQuery().eq(UserPoint::getType, 1).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
+ List<UserPoint> list2 = userPointService.lambdaQuery().eq(UserPoint::getType, 2).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
+ List<UserPoint> list3 = userPointService.lambdaQuery().eq(UserPoint::getType, 5).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
+ Integer userKeepBuyPoint = 0;
+ for (UserPoint userPoint : list1) {
+ userKeepBuyPoint = userPoint.getVariablePoint() + userKeepBuyPoint;
+ }
+ Integer userKeepSharePoint = 0;
+ for (UserPoint userPoint : list2) {
+ userKeepSharePoint = userPoint.getVariablePoint() + userKeepSharePoint;
+ }
+ Integer userKeepShopPoint = 0;
+ for (UserPoint userPoint : list3) {
+ userKeepShopPoint = userPoint.getVariablePoint() + userKeepShopPoint;
+ }
+ dangerInfoDto.setUserKeepBuyPoint(userKeepBuyPoint);
+ dangerInfoDto.setUserKeepSharePoint(userKeepSharePoint);
+ dangerInfoDto.setUserKeepShopPoint(userKeepShopPoint);
+ return R.ok(dangerInfoDto);
+ }
+
+
+ @GetMapping("/danger/down")
+ @ApiOperation(value = "用户列表-保级条件降级", tags = {"管理后台"})
+ public R down(Long id) {
+ AppUser byId = appUserService.getById(id);
+ byId.setVipId(byId.getVipId() - 1);
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
+ @GetMapping("/frozen")
+ @ApiOperation(value = "用户列表-冻结解冻", tags = {"管理后台"})
+ public R frozen(Long id, @ApiParam("1=正常，2=冻结") Integer status) {
+ AppUser byId = appUserService.getById(id);
+ byId.setStatus(status);
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
+ @GetMapping("/select")
+ @ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
+ public R<AppUser> select(String phone) {
+ AppUser byId = appUserService.lambdaQuery()
+ .eq(AppUser::getPhone, phone)
+ .eq(AppUser::getDelFlag,0)
+ .eq(AppUser::getStatus,1)
+ .one();
+ if (byId == null) {
+ return R.fail("搜索失败，手机号错误。");
+ }
+ return R.ok(byId);
+ }
+
+ @GetMapping("/change/bind")
+ @ApiOperation(value = "用户列表-更换绑定人", tags = {"管理后台"})
+ public R<AppUser> select(Long id, Long inviteId) {
+ AppUser byId = appUserService.getById(id);
+ Long userId = byId.getId();
+ if (userId.equals(inviteId)) {
+ return R.fail("不能选择自己为绑定人。");
+ }
+ byId.setInviteUserId(inviteId);
+ byId.setTopInviteId(getTop(inviteId));
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
+ @GetMapping("/change/shop")
+ @ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"})
+ public R<AppUser> shop(Long id, Integer shopId) {
+ AppUser byId = appUserService.getById(id);
+ byId.setShopId(shopId);
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
+
+ public Long getTop(Long inviteId) {
+ AppUser byId = appUserService.getById(inviteId);
+ if (byId != null) {
+ return getTop(byId.getInviteUserId());
+ } else {
+ return inviteId;
+ }
+ }
+
+
+ @GetMapping("/detail")
+ @ApiOperation(value = "用户列表-详情", tags = {"管理后台"})
+ public R<AppUser> detail(Long id) {
+
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ AppUser byId = appUserService.getById(id);
+ if (byId.getShopId() != null) {
+ R<Shop> shopById = shopClient.getShopById(Integer.parseInt(String.valueOf(byId.getShopId())));
+ if (shopById.getData() != null) {
+ byId.setShopName(shopById.getData().getName());
+ }
+ }
+ R<List<Shop>> shopByUserId = shopClient.getShopByUserId(id);
+ if (shopByUserId.getData() != null) {
+ List<String> shopName = new ArrayList<>();
+ for (Shop datum : shopByUserId.getData()) {
+ shopName.add(datum.getName());
+ }
+ byId.setShopNames(shopName);
+ }
+ //推广人
+ if (byId.getInviteUserId() != null) {
+ AppUser appUser = appUserService.getById(byId.getInviteUserId());
+ if(null != appUser){
+ byId.setInviteUserName(appUser.getName());
+ }
+ }
+ //最后下单时间
+ R<Order> lastOrder = remoteOrderGoodsClient.getLastOrder(id);
+ if (lastOrder.getData() != null) {
+ byId.setLastOrderTime(lastOrder.getData().getCreateTime());
+ }
+ List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
+ byId.setBottomUsers(list);
+ //消费总金额
+ R<List<Order>> orderR = remoteOrderGoodsClient.byShopId(sysUser.getObjectId());
+ List<Order> orderList = orderR.getData();
+ if (!CollectionUtils.isEmpty(orderList)){
+ BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ byId.setShopAmount(paymentAmount);
+ }else {
+ byId.setShopAmount(BigDecimal.ZERO);
+ }
+ return R.ok(byId);
+ }
+
+ @Resource
+ private UserChangeLogService userChangeLogService;
+
+ @GetMapping("/change/vip")
+ @ApiOperation(value = "用户列表-修改会员等级", tags = {"管理后台"})
+ public R<Page<AppUser>> changevip(Long id, Integer vipId) {
+ AppUser byId = appUserService.getById(id);
+
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(byId.getId());
+ userChangeLog.setBeforeVipId(byId.getVipId());
+ userChangeLog.setAfterVipId(vipId);
+ if (userChangeLog.getBeforeVipId() > userChangeLog.getAfterVipId()) {
+ userChangeLog.setChangeType(0);
+ } else {
+ userChangeLog.setChangeType(1);
+ }
+ userChangeLogService.save(userChangeLog);
+ byId.setVipId(vipId);
+ appUserService.updateById(byId);
+ return R.ok();
+
+ }
+
+ @GetMapping("/bottom")
+ @ApiOperation(value = "用户列表-绑定下级列表", tags = {"管理后台"})
+ public R<Page<AppUser>> bottom(Long id, Integer pageNum, Integer pageSize) {
+ //绑定下级
+ Page<AppUser> page = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+
+ }
+
+ @GetMapping("/orders")
+ @ApiOperation(value = "用户列表-订单列表", tags = {"管理后台"})
+ public R<List<Order>> orders(Long id) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ Long shopId = Long.valueOf(sysUser.getObjectId());
+ R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id,shopId);
+ return R.ok(listR.getData());
+
+ }
+
+
+ @PostMapping("/listByIds")
+ public List<AppUser> listByIds(@RequestParam("ids") List<Long> ids) {
+ if(ids.size() == 0){
+ return new ArrayList<>();
+ }
+ List<AppUser> appUsers = appUserService.listByIds(ids);
+ return appUsers;
+ }
+
+
+ @PostMapping("/getAppUserByPhone1")
+ public R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone) {
+ AppUser appUser = appUserService.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).ne(AppUser::getStatus, 3)
+ .eq(AppUser::getPhone, phone));
+ return R.ok(appUser);
+ }
+
+
+ /**
+ * 设置指定用户的下级用户绑定门店
+ */
+ @PostMapping("/setLowerUserShop")
+ public R<Void> setLowerUserShop(@RequestParam("userId") Long userId,@RequestParam("shopId") Integer shopId) {
+ appUserService.update(new LambdaUpdateWrapper<AppUser>()
+ .set(AppUser::getShopId,shopId)
+ .eq(AppUser::getInviteUserId, userId));
+ return R.ok();
+ }
+
+
+ /**
+ * 用户统计
+ */
+ @GetMapping("/statistics")
+ @ApiOperation(value = "用户统计", tags = {"管理后台-首页统计-用户统计"})
+ public R<UserStatistics> statistics() {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
+ Integer shopId = null;
+ Set<Long> userId = null;
+ if(data.getRoleType() == 2){
+ shopId = data.getObjectId();
+ userId = orderClient.getAppUserByShoppingShop(shopId).getData();
+ }
+ UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
+ return R.ok(userStatistics);
+ }
+
+ /**
+ * 用户统计详情
+ */
+ @GetMapping("/statistics/detail")
+ @ApiOperation(value = "用户统计详情", tags = {"管理后台-首页统计-用户统计详情"})
+ public R<UserStatisticsDetail> statisticsDetail(@ApiParam(value = "用户id") Long userId) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
+ Integer shopId = null;
+ Set<Long> userIds = null;
+ if(null != userId){
+ userIds = new HashSet<>();
+ userIds.add(userId);
+ }
+ if(data.getRoleType() == 2){
+ shopId = data.getObjectId();
+ if(null == userId){
+ userIds = orderClient.getAppUserByShoppingShop(shopId).getData();
+ }else{
+ userIds = new HashSet<>();
+ userIds.add(userId);
+ }
+ }
+ UserStatisticsDetail userStatisticsDetail = appUserMapper.getUserStatisticsDetail(shopId, userIds);
+ return R.ok(userStatisticsDetail);
+ }
+
+
+ /**
+ * 分佣统计明细
+ */
+ @GetMapping("/commissionDetail")
+ @ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")
+ public R<CommissionDetail> commissionDetail(CommissionDetail cd) {
+ if (cd.getStartTime() == null || cd.getEndTime() == null) {
+ return R.fail("请选择时间");
+ }
+ if (cd.getStartTime().isAfter(cd.getEndTime())) {
+ return R.fail("开始时间不能大于结束时间");
+ }
+
+
+ Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();
+ getDatesBetween(cd.getStartTime(), cd.getEndTime()).forEach(date -> {
+ for (int i = 1; i < 8; i++){
+ List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
+ .between(BalanceChangeRecord::getCreateTime, date, date.plusDays(1))
+ .eq(BalanceChangeRecord::getChangeType,4)
+ .eq(BalanceChangeRecord::getVipId, i));
+ BigDecimal reduce = list.stream().map(BalanceChangeRecord::getChangeAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+ .merge(i, reduce, BigDecimal::add);
+ }
+
+ for (int i = 1; i < 4; i++){
+ R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, date);
+ if (!CollectionUtils.isEmpty(r.getData())){
+ List<ShopBalanceStatement> list = r.getData();
+ BigDecimal reduce = list.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ int type;
+ if (i == 1){
+ type = 8;
+ }else if (i == 2){
+ type = 9;
+ }else {
+ type = 10;
+ }
+ dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+ .merge(type, reduce, BigDecimal::add);
+ }
+ }
+ });
+
+
+ BigDecimal totalCommission = BigDecimal.ZERO;
+ BigDecimal totalNormalCommission = BigDecimal.ZERO;
+
+ BigDecimal totalGoldCommission = BigDecimal.ZERO;
+
+ BigDecimal totalDiamondCommission = BigDecimal.ZERO;
+
+ BigDecimal totalAgentCommission = BigDecimal.ZERO;
+
+ BigDecimal totalSuperAgentCommission = BigDecimal.ZERO;
+
+ BigDecimal totalTopAgentCommission = BigDecimal.ZERO;
+
+ BigDecimal totalPartnerCommission = BigDecimal.ZERO;
+
+ List<AppUser> allAppUserList = appUserService.list();
+ for (AppUser appUser : allAppUserList) {
+ BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
+ totalCommission = totalCommission.add(totalDistributionAmount);
+ if (appUser.getVipId() == 1){
+ totalNormalCommission = totalNormalCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 2){
+ totalGoldCommission = totalGoldCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 3){
+ totalDiamondCommission = totalDiamondCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 4){
+ totalAgentCommission = totalAgentCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 5){
+ totalSuperAgentCommission = totalSuperAgentCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 6){
+ totalTopAgentCommission = totalTopAgentCommission.add(totalDistributionAmount);
+ }
+ if (appUser.getVipId() == 7){
+ totalPartnerCommission = totalPartnerCommission.add(totalDistributionAmount);
+ }
+ }
+
+ R<Map<String, BigDecimal>> shopStatistics = shopClient.getShopStatistics();
+ Map<String, BigDecimal> data = shopStatistics.getData();
+ BigDecimal totalServiceFee = BigDecimal.ZERO;
+ BigDecimal totalUserCommission = BigDecimal.ZERO;
+ if (data != null){
+ totalServiceFee = data.get("serverGiveawayMoney");
+ totalUserCommission = data.get("lowerLevelGiveawayMoney");
+ }
+
+ CommissionDetail commissionDetail = new CommissionDetail();
+ commissionDetail.setTotalCommission(totalCommission);
+ commissionDetail.setTotalServiceFee(totalServiceFee);
+ commissionDetail.setTotalUserCommission(totalUserCommission);
+
+ commissionDetail.setTotalNormalCommission(totalNormalCommission);
+ commissionDetail.setTotalGoldCommission(totalGoldCommission);
+ commissionDetail.setTotalDiamondCommission(totalDiamondCommission);
+ commissionDetail.setTotalAgentCommission(totalAgentCommission);
+ commissionDetail.setTotalSuperAgentCommission(totalSuperAgentCommission);
+ commissionDetail.setTotalTopAgentCommission(totalTopAgentCommission);
+ commissionDetail.setTotalPartnerCommission(totalPartnerCommission);
+
+
+ List<CommissionDate> commissionDateList = dailyVipCommissions.entrySet().stream()
+ .map(entry -> {
+ CommissionDate commissionDate = new CommissionDate();
+ commissionDate.setDate(entry.getKey());
+ Map<Integer, BigDecimal> dailyCommissions = entry.getValue();
+ commissionDate.setNormalCommission(dailyCommissions.getOrDefault(1, BigDecimal.ZERO));
+ commissionDate.setGoldCommission(dailyCommissions.getOrDefault(2, BigDecimal.ZERO));
+ commissionDate.setDiamondCommission(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));
+ commissionDate.setAgentCommission(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));
+ commissionDate.setSuperAgentCommission(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));
+ commissionDate.setTopAgentCommission(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));
+ commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));
+ BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission())
+ .add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission());
+ commissionDate.setTotalCommission(add);
+
+ commissionDate.setServiceChargeCommission(dailyCommissions.getOrDefault(10, BigDecimal.ZERO));
+ commissionDate.setAssociatedUserCommission(dailyCommissions.getOrDefault(8, BigDecimal.ZERO));
+ commissionDate.setBindLowerLevelStoresCommission(dailyCommissions.getOrDefault(9, BigDecimal.ZERO));
+ return commissionDate;
+ })
+ .collect(Collectors.toList());
+
+ commissionDetail.setCommissionDateList(commissionDateList);
+
+ return R.ok(commissionDetail);
+ }
+
+
+ /**
+ * 获取指定时间段内每一天的列表
+ *
+ * @param startDate 开始日期时间
+ * @param endDate 结束日期时间
+ * @return 包含每天日期时间的列表
+ */
+ private static List<LocalDateTime> getDatesBetween(LocalDateTime startDate, LocalDateTime endDate) {
+ // 计算开始日期和结束日期之间的天数差（忽略时间部分）
+ long daysBetween = ChronoUnit.DAYS.between(startDate.toLocalDate(), endDate.toLocalDate());
+
+ // 使用Stream.iterate从开始日期开始迭代，每次增加一天，直到达到天数差+1
+ return Stream.iterate(startDate, date -> date.plus(1, ChronoUnit.DAYS))
+ .limit(daysBetween + 1)
+ .collect(Collectors.toList());
+ }
+
+
+
+ /**
+ * 上传图片
+ * @param file
+ * @return
+ */
+ @PostMapping("/upload")
+ public String upload(MultipartFile file){
+ String s = null;
+ try {
+ s = ObsUploadUtil.obsUpload(file);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return s;
+ }
+
+
+ /**
+ * 检查会员等级变更
+ * @param appUserId
+ */
+ @PostMapping("/vipUpgrade")
+ public void vipUpgrade(@RequestParam("appUserId") Long appUserId){
+ appUserService.vipUpgrade(appUserId);
+ }
+
+
+ /**
+ * 检查会员降级
+ * @param appUserId
+ */
+ @PostMapping("/app-user/vipDemotion")
+ public void vipDemotion(@RequestParam("appUserId") Long appUserId){
+ appUserService.vipDemotion(appUserId);
+ }
+
+
+
+ /**
+ * 用户降级检测
+ */
+ @PostMapping("/demotionDetection")
+ public void demotionDetection(){
+ appUserService.demotionDetection();
+ }
+
+
+ /**
+ * 清空绑定门店的用户门店数据
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/clearBindShop")
+ public R clearBindShop(@RequestParam("shopId") Integer shopId){
+ appUserService.update(new LambdaUpdateWrapper<AppUser>().eq(AppUser::getShopId, shopId).set(AppUser::getShopId, null)
+ .set(AppUser::getUserType,1));
+ return R.ok();
+ }
}
--
Gitblit v1.7.1