From 87a597dd71f67e05367169640f862bcef809e720 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 一月 2025 11:59:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 353 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 285 insertions(+), 68 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 d455ab3..25f0f98 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
@@ -2,6 +2,9 @@
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;
@@ -19,15 +22,25 @@
import com.ruoyi.account.util.ObsUploadUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.web.page.PageInfo;
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;
@@ -39,8 +52,10 @@
import java.time.LocalDate;
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;
@@ -81,6 +96,20 @@
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
@@ -99,7 +128,6 @@
}
- @ResponseBody
@PostMapping("/getAppUserById")
public AppUser getAppUserById(@RequestParam("id") Long id) {
return appUserService.getById(id);
@@ -128,7 +156,11 @@
@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();
+ 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);
}
@@ -173,10 +205,8 @@
@ResponseBody
@GetMapping("/getNearbyReferrer")
@ApiOperation(value = "获取附近推荐人列表")
- public TableDataInfo<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
- startPage();
- List<NearbyReferrerVo> list = appUserService.getNearbyReferrer(nearbyReferrer);
- return getDataTable(list);
+ public R<PageInfo<NearbyReferrerVo>> getNearbyReferrer(NearbyReferrer nearbyReferrer) {
+ return R.ok(appUserService.getNearbyReferrer(nearbyReferrer));
}
@@ -189,8 +219,7 @@
return R.ok(user);
}
- @Resource
- private UserCancellationLogService userCancellationLogService;
+
@ResponseBody
@GetMapping("/unregis")
@@ -204,8 +233,8 @@
userCancellationLog.setAppUserId(user.getId());
userCancellationLog.setVipId(user.getVipId());
userCancellationLogService.save(userCancellationLog);
-
-
+ user.setStatus(3);
+ appUserService.updateById(user);
return R.ok();
}
@@ -232,15 +261,15 @@
user.setTopUser(byId);
}
//获取绑定下级列表
- List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, user.getInviteUserId()).list();
+ List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, user.getId()).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();
+ Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, appUser.getId()).count();
+ Long count2 = appUserService.lambdaQuery().eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, appUser.getId()).count();
+ Long count3 = appUserService.lambdaQuery().eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, appUser.getId()).count();
+ Long count4 = appUserService.lambdaQuery().eq(AppUser::getVipId, 4).eq(AppUser::getInviteUserId, appUser.getId()).count();
+ Long count5 = appUserService.lambdaQuery().eq(AppUser::getVipId, 5).eq(AppUser::getInviteUserId, appUser.getId()).count();
+ Long count6 = appUserService.lambdaQuery().eq(AppUser::getVipId, 6).eq(AppUser::getInviteUserId, appUser.getId()).count();
+ Long count7 = appUserService.lambdaQuery().eq(AppUser::getVipId, 7).eq(AppUser::getInviteUserId, appUser.getId()).count();
appUser.setCount1(count1);
appUser.setCount2(count2);
appUser.setCount3(count3);
@@ -274,7 +303,6 @@
@GetMapping("/index")
@ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
public R<AppUser> index() {
- System.err.println("=-====");
Long userId = tokenService.getLoginUserApplet().getUserid();
//当前用户信息
AppUser user = appUserService.getById(userId);
@@ -287,16 +315,17 @@
if (user.getShopId() != null) {
R<Shop> storeById = shopClient.getShopById(user.getShopId());
if (storeById.getData() != null) {
- user.setShopName(storeById.getData().getName());
+ Shop shop = storeById.getData();
+ user.setShopName(shop.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();
+ Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+ Long count2 = appUserService.lambdaQuery().eq(AppUser::getVipId, 2).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+ Long count3 = appUserService.lambdaQuery().eq(AppUser::getVipId, 3).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+ Long count4 = appUserService.lambdaQuery().eq(AppUser::getVipId, 4).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+ Long count5 = appUserService.lambdaQuery().eq(AppUser::getVipId, 5).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+ Long count6 = appUserService.lambdaQuery().eq(AppUser::getVipId, 6).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
+ Long count7 = appUserService.lambdaQuery().eq(AppUser::getVipId, 7).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
user.setCount1(count1);
user.setCount2(count2);
user.setCount3(count3);
@@ -392,7 +421,15 @@
public R<IPage<AppUser>> getAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
@ApiParam("每一页数据大小") Integer pageSize,
AppUser appUser) {
- IPage<AppUser> appuserPage = appUserService.getAppuserPage(pageNum, pageSize, 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());
@@ -415,11 +452,14 @@
public R<IPage<AppUser>> shopGetAppuserPage(@ApiParam("页码") @RequestParam Integer pageCurr,
@ApiParam("每一页数据大小") Integer pageSize,
AppUser appUser) {
- Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ 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);
for (Order datum : listR.getData()) {
userIds.add(datum.getAppUserId());
@@ -466,16 +506,6 @@
AppUser byId = appUserService.getById(id);
byId.setVipId(byId.getVipId() - 1);
appUserService.updateById(byId);
- //执行降级标记代码
- new Thread(new Runnable() {
- @Override
- public void run() {
- {
- vipSettingService.downUsers();
- }
- }
- }
- ).start();
return R.ok();
}
@@ -491,7 +521,11 @@
@GetMapping("/select")
@ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
public R<AppUser> select(String phone) {
- AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
+ AppUser byId = appUserService.lambdaQuery()
+ .eq(AppUser::getPhone, phone)
+ .eq(AppUser::getDelFlag,0)
+ .eq(AppUser::getStatus,1)
+ .one();
if (byId == null) {
return R.fail("搜索失败，手机号错误。");
}
@@ -502,6 +536,10 @@
@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);
@@ -528,14 +566,15 @@
}
- @Resource
- private ShopClient shopClient;
- @Resource
- private RemoteOrderGoodsClient remoteOrderGoodsClient;
+
+
@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())));
@@ -553,15 +592,27 @@
}
//推广人
if (byId.getInviteUserId() != null) {
- AppUser byId1 = appUserService.getById(byId.getInviteUserId());
- byId.setInviteUserName(byId1.getInviteUserName());
+ 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);
}
@@ -608,8 +659,11 @@
}
- @GetMapping("/listByIds")
- List<AppUser> listByIds(@RequestParam("ids") List<Long> ids) {
+ @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;
}
@@ -617,10 +671,23 @@
@PostMapping("/getAppUserByPhone1")
public R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone) {
- AppUser appUser = appUserService.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)
+ 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();
+ }
+
/**
* 用户统计
@@ -628,7 +695,18 @@
@GetMapping("/statistics")
@ApiOperation(value = "用户统计", tags = {"管理后台-首页统计-用户统计"})
public R<UserStatistics> statistics() {
- UserStatistics userStatistics = appUserMapper.getUserStatistics();
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser data = sysUserClient.getSysUser(userid).getData();
+ Integer shopId = null;
+ Set<Long> userId = null;
+ Set<Long> userIdT = null;
+ if(data.getRoleType() == 2){
+ shopId = data.getObjectId();
+ userId = orderClient.getAppUserByShoppingShop(shopId).getData();
+ }
+ UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
+ UserStatistics userStatistics1 = appUserMapper.getUserStatistics(shopId, userIdT);
+ userStatistics.setShopUser(userStatistics1.getShopUser());
return R.ok(userStatistics);
}
@@ -638,7 +716,24 @@
@GetMapping("/statistics/detail")
@ApiOperation(value = "用户统计详情", tags = {"管理后台-首页统计-用户统计详情"})
public R<UserStatisticsDetail> statisticsDetail(@ApiParam(value = "用户id") Long userId) {
- UserStatisticsDetail userStatisticsDetail = appUserMapper.getUserStatisticsDetail(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);
}
@@ -648,28 +743,30 @@
*/
@GetMapping("/commissionDetail")
@ApiOperation(value = "分佣统计", tags = "管理后台-首页统计")
- public R<CommissionDetail> commissionDetail(BalanceChangeRecord balanceChangeRecord) {
- List<AppUser> appUserList = Optional.ofNullable(appUserService.list()).orElse(Collections.emptyList());
-
+ public R<CommissionDetail> commissionDetail(CommissionDetail cd) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
+ LambdaQueryWrapper<AppUser> queryWrapper = new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0);
+ if(sysUser.getRoleType() == 2){
+ queryWrapper.eq(AppUser::getShopId, sysUser.getObjectId());
+ }
+ LocalDateTime startTime = cd.getStartTime();
+ LocalDateTime endTime = cd.getEndTime();
+ queryWrapper.ge(null != startTime, AppUser::getCreateTime, startTime);
+ queryWrapper.le(null != endTime, AppUser::getCreateTime, endTime);
+ queryWrapper.orderByAsc(AppUser::getCreateTime);
+ List<AppUser> appUserList = appUserService.list(queryWrapper);
if (appUserList.isEmpty()) {
return R.ok(new CommissionDetail());
}
-
BigDecimal totalCommission = BigDecimal.ZERO;
BigDecimal totalServiceFee = BigDecimal.ZERO;
BigDecimal totalUserCommission = BigDecimal.ZERO;
Map<Integer, BigDecimal> vipCommissions = new HashMap<>();
- Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new HashMap<>();
-
+ Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();
for (AppUser appUser : appUserList) {
BigDecimal distributionAmount = Optional.ofNullable(appUser.getTotalDistributionAmount()).orElse(BigDecimal.ZERO);
- BigDecimal serviceFee = Optional.ofNullable(appUser.getShopServiceFee()).orElse(BigDecimal.ZERO);
- BigDecimal userCommission = Optional.ofNullable(appUser.getShopCommission()).orElse(BigDecimal.ZERO);
-
totalCommission = totalCommission.add(distributionAmount);
- totalServiceFee = totalServiceFee.add(serviceFee);
- totalUserCommission = totalUserCommission.add(userCommission);
-
Integer vipId = appUser.getVipId();
if (vipId != null && vipId >= 1 && vipId <= 7) {
vipCommissions.merge(vipId, distributionAmount, BigDecimal::add);
@@ -679,6 +776,33 @@
.merge(vipId, distributionAmount, BigDecimal::add);
}
}
+ List<Shop> data = shopClient.getAllShop().getData();
+ if(sysUser.getRoleType() == 2){
+ data = Arrays.asList(shopClient.getShopById(sysUser.getObjectId()).getData());
+ }
+ for (Shop shop : data) {
+ totalServiceFee = totalServiceFee.add(shop.getServerGiveawayMoney());
+ totalUserCommission = totalUserCommission.add(shop.getGiveawayMoney());
+ }
+
+ R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), null);
+ List<ShopBalanceStatement> data1 = r.getData();
+ if (!CollectionUtils.isEmpty(data1)){
+ for (ShopBalanceStatement shopBalanceStatement : data1) {
+ String dateKey = shopBalanceStatement.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Integer type = shopBalanceStatement.getType();
+ if (type == 1){
+ type = 8;
+ }else if (type == 2){
+ type = 9;
+ }else {
+ type = 10;
+ }
+ dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())
+ .merge(type, shopBalanceStatement.getVariableAmount(), BigDecimal::add);
+ }
+ }
+
CommissionDetail commissionDetail = new CommissionDetail();
commissionDetail.setTotalCommission(totalCommission);
@@ -708,17 +832,79 @@
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();
-// commissionDate.setAssociatedUserCommission();
-// commissionDate.setBindLowerLevelStoresCommission();
+
+ 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);
+ }
+
+
+ public R<CommissionDetail> commissionDetail2(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>()
+ .eq(BalanceChangeRecord::getCreateTime, date)
+ .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);
+ }
+ }
+ });
+ return null;
+ }
+
+
+ /**
+ * 获取指定时间段内每一天的列表
+ *
+ * @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());
}
@@ -737,5 +923,36 @@
}
return s;
}
+
+
+ /**
+ * 检查会员等级变更
+ * @param appUserId
+ */
+ @PostMapping("/vipUpgrade")
+ public void vipUpgrade(@RequestParam("appUserId") Long appUserId){
+ appUserService.vipUpgrade(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));
+ return R.ok();
+ }
}
--
Gitblit v1.7.1