From a74d740849c6b25b57e18c67ed14b0f5fea79a12 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 11 二月 2025 10:06:05 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 381 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 299 insertions(+), 82 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 d89af69..b52bdb8 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,6 +1,7 @@
package com.ruoyi.account.controller;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,11 +12,16 @@
import com.ruoyi.account.mapper.AppUserMapper;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.ObsUploadUtil;
+import com.ruoyi.account.util.weChat.EnvVersion;
+import com.ruoyi.account.util.weChat.WeChatUtil;
import com.ruoyi.account.vo.*;
+import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
@@ -29,7 +35,10 @@
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -56,9 +65,9 @@
@Api(tags = {"登录注册-小程序"})
@RestController
@RequestMapping("/app-user")
+@Slf4j
public class AppUserController extends BaseController {
-
-
+
@Resource
private TokenService tokenService;
@Resource
@@ -92,6 +101,16 @@
private UserCancellationLogService userCancellationLogService;
@Resource
private BalanceChangeRecordService balanceChangeRecordService;
+ @Resource
+ private UserChangeLogService userChangeLogService;
+ @Resource
+ private RedisService redisService;
+
+ @Resource
+ private WeChatUtil weChatUtil;
+
+ @Value("${file.upload.location}")
+ private String filePath;
@ResponseBody
@@ -114,6 +133,17 @@
public AppUser getAppUserById(@RequestParam("id") Long id) {
return appUserService.getById(id);
}
+
+ @PostMapping("/getBaseUserById")
+ public R<Map<String, Object>> getBaseUserById(@RequestParam("id") Long id) {
+ AppUser appUser = appUserService.getById(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", appUser.getId());
+ map.put("name", appUser.getName());
+ map.put("phone", appUser.getPhone());
+ return R.ok(map);
+ }
+
@ResponseBody
@PostMapping("/editAppUserById")
@@ -200,6 +230,13 @@
public R<AppUser> info() {
Long userId = tokenService.getLoginUserApplet().getUserid();
AppUser user = appUserService.getById(userId);
+ if(StringUtils.isEmpty(user.getQrCode())){
+ //获取微信推广二维码
+ String fileName = UUID.randomUUID() + ".jpg";
+ String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/start/start", "id=" + user.getId(), EnvVersion.RELEASE, filePath + fileName);
+ user.setQrCode(getwxacodeunlimit);
+ appUserService.updateById(user);
+ }
return R.ok(user);
}
@@ -258,49 +295,87 @@
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.list();
+
+ Long vip1Count1 =0L;
+ Long vip1Count2 =0L;
+ Long vip1Count3 =0L;
+ Long vip1Count4 =0L;
+ Long vip1Count5 =0L;
+ Long vip1Count6 =0L;
+ Long vip1Count7 =0L;
for (AppUser appUser : list) {
+ if (appUser.getVipId() == 1){
+ vip1Count1++;
+ }
+ if (appUser.getVipId() == 2){
+ vip1Count2++;
+ }
+ if (appUser.getVipId() == 3){
+ vip1Count3++;
+ }
+ if (appUser.getVipId() == 4){
+ vip1Count4++;
+ }
+ if (appUser.getVipId() == 5){
+ vip1Count5++;
+ }
+ if (appUser.getVipId() == 6){
+ vip1Count6++;
+ }
+ if (appUser.getVipId() == 7){
+ vip1Count7++;
+ }
+
Long count1 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 1)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count1 += count1;
+
Long count2 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 2)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count2 += count2;
Long count3 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 3)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count3 += count3;
Long count4 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 4)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count4 += count4;
Long count5 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 5)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count5 += count5;
Long count6 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 6)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count6 += count6;
Long count7 = appUserService.lambdaQuery()
.eq(AppUser::getVipId, 7)
.eq(AppUser::getInviteUserId, appUser.getId())
.eq(AppUser::getDelFlag, 0)
.ne(AppUser::getStatus, 3)
.count();
+ vip1Count7 += count7;
appUser.setCount1(count1);
appUser.setCount2(count2);
appUser.setCount3(count3);
@@ -310,7 +385,13 @@
appUser.setCount7(count7);
}
user.setBottomUsers(list);
-
+ user.setCount1(vip1Count1);
+ user.setCount2(vip1Count2);
+ user.setCount3(vip1Count3);
+ user.setCount4(vip1Count4);
+ user.setCount5(vip1Count5);
+ user.setCount6(vip1Count6);
+ user.setCount7(vip1Count7);
return R.ok(user);
}
@@ -320,6 +401,12 @@
public R<AppUser> change(@ApiParam("换绑用户手机号") String phone) {
Long userId1 = tokenService.getLoginUserApplet().getUserid();
AppUser byId = appUserService.getById(userId1);
+ List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getInviteUserId, userId1)
+ .eq(AppUser::getPhone, phone));
+ if (!CollectionUtils.isEmpty(appUserList)){
+ return R.fail("绑定关系已存在！");
+ }
//获取绑定门店
AppUser user = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
if (user == null) {
@@ -337,6 +424,14 @@
Long userId = tokenService.getLoginUserApplet().getUserid();
//当前用户信息
AppUser user = appUserService.getById(userId);
+ if(StringUtils.isEmpty(user.getQrCode())){
+ //获取微信推广二维码
+ String fileName = UUID.randomUUID() + ".jpg";
+ String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/start/start", "id=" + user.getId(), EnvVersion.RELEASE, filePath + fileName);
+ user.setQrCode(getwxacodeunlimit);
+ appUserService.updateById(user);
+ }
+
//当前用户的推荐人信息
if (user.getInviteUserId() != null) {
AppUser inviteUser = appUserService.getById(user.getInviteUserId());
@@ -380,6 +475,8 @@
}
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)){
@@ -449,6 +546,16 @@
.like(AppUser::getName, name));
return R.ok(list);
}
+ /**
+ * 根据用户名称模糊搜索用户列表,不过滤状态
+ */
+ @GetMapping("/getAppUserByNameNoFilter")
+ public R<List<AppUser>> getAppUserByNameNoFilter(@RequestParam("name") String name) {
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .like(AppUser::getName, name));
+ return R.ok(list);
+ }
+
/**
* 根据用户电话模糊搜索用户列表
@@ -460,6 +567,15 @@
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("/getAppUserByPhoneNoFilter")
+ public R<List<AppUser>> getAppUserByPhoneNoFilter(@RequestParam("phone") String phone) {
+ List<AppUser> list = appUserService.getAppUserByPhoneNoFilter(phone);
return R.ok(list);
}
@@ -531,7 +647,7 @@
DangerInfoDto dangerInfoDto = new DangerInfoDto();
BeanUtils.copyProperties(data, dangerInfoDto);
List<UserPoint> list1 = userPointService.lambdaQuery().eq(UserPoint::getAppUserId,id).eq(UserPoint::getType, 1).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
- List<UserPoint> list2 = userPointService.lambdaQuery().eq(UserPoint::getAppUserId,id).eq(UserPoint::getType, 9).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
+ List<UserPoint> list2 = userPointService.lambdaQuery().eq(UserPoint::getAppUserId,id).eq(UserPoint::getType, 2).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
List<UserPoint> list3 = userPointService.lambdaQuery().eq(UserPoint::getAppUserId,id).eq(UserPoint::getType, 8).ge(UserPoint::getCreateTime, now.minusDays(data.getKeepBuyDay())).list();
Integer userKeepBuyPoint = 0;
for (UserPoint userPoint : list1) {
@@ -565,6 +681,27 @@
userChangeLog.setChangeType(0);
userChangeLogService.save(userChangeLog);
appUser.setVipId(appUser.getVipId() - 1);
+ appUser.setIsDanger(0);
+ //检查是否达标，不达标继续标红
+ VipSetting vipSetting = vipSettingClient.getVipSetting(appUser.getVipId()).getData();
+ //消费积分
+ List<UserPoint> list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 1).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepBuyDay() + " DAY) <= create_time"));
+ int sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
+ if(sum < vipSetting.getKeepBuyPoint()){
+ appUser.setIsDanger(1);
+ }
+ //返佣积分
+ list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 2).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShareDay() + " DAY) <= create_time"));
+ sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
+ if(sum < vipSetting.getKeepSharePoint()){
+ appUser.setIsDanger(1);
+ }
+ //门店业绩
+ list1 = userPointService.list(new LambdaQueryWrapper<UserPoint>().eq(UserPoint::getAppUserId, appUser.getId()).eq(UserPoint::getType, 8).last(" and SUBDATE(now(), INTERVAL " + vipSetting.getKeepShopDay() + " DAY) <= create_time"));
+ sum = list1.stream().mapToInt(UserPoint::getVariablePoint).sum();
+ if(sum < vipSetting.getKeepShopPoint()){
+ appUser.setIsDanger(1);
+ }
appUserService.updateById(appUser);
return R.ok();
}
@@ -575,7 +712,26 @@
AppUser byId = appUserService.getById(id);
byId.setStatus(status);
appUserService.updateById(byId);
+ if (status == 2){
+ loginout(id);
+ }
return R.ok();
+ }
+
+ private void loginout(Long userId) {
+ Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+ if (!CollectionUtils.isEmpty(keys)) {
+ for (String key : keys) {
+ LoginUser user = redisService.getCacheObject(key);
+ if (user == null || user.getUserid() == null) {
+ continue;
+ }
+ if (user.getUserid().equals(userId)) {
+ redisService.deleteObject(key);
+ break;
+ }
+ }
+ }
}
@GetMapping("/select")
@@ -600,6 +756,14 @@
if (userId.equals(inviteId)) {
return R.fail("不能选择自己为绑定人。");
}
+
+ List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getInviteUserId, id)
+ .eq(AppUser::getId, inviteId));
+ if (!CollectionUtils.isEmpty(appUserList)){
+ return R.fail("绑定关系已存在！");
+ }
+
byId.setInviteUserId(inviteId);
byId.setTopInviteId(getTop(inviteId));
appUserService.updateById(byId);
@@ -631,8 +795,7 @@
@GetMapping("/detail")
@ApiOperation(value = "用户列表-详情", tags = {"管理后台"})
- public R<AppUser> detail(Long id,Integer shopId) {
-
+ public R<AppUser> detail(Long id, Integer shopId) {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
AppUser byId = appUserService.getById(id);
@@ -665,7 +828,13 @@
List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
byId.setBottomUsers(list);
//消费总金额
- R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,shopId);
+ if(null == shopId || 1 == sysUser.getRoleType()){
+ shopId = -1;
+ }
+ if(null == shopId && 2 == sysUser.getRoleType()){
+ shopId = sysUser.getObjectId();
+ }
+ R<List<Order>> orderR = remoteOrderGoodsClient.byUserId(id, shopId);
List<Order> orderList = orderR.getData();
if (!CollectionUtils.isEmpty(orderList)){
BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -676,8 +845,21 @@
return R.ok(byId);
}
- @Resource
- private UserChangeLogService userChangeLogService;
+ /**
+ * 获取指定用户的下级用户
+ */
+ @GetMapping("/bottom/list")
+ @ApiOperation(value = "用户列表-下级用户", tags = {"管理后台"})
+ public R<Page<AppUser>> bottom(Integer pageNum, Integer pageSize, Long userId){
+ Page<AppUser> page = appUserService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<AppUser>()
+ .eq(AppUser::getInviteUserId, userId));
+ return R.ok(page);
+ }
+
+
+
+
+
@GetMapping("/change/vip")
@ApiOperation(value = "用户列表-修改会员等级", tags = {"管理后台"})
@@ -698,27 +880,52 @@
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));
+ Page<AppUser> page = appUserService.lambdaQuery()
+ .eq(AppUser::getInviteUserId, id)
+ .eq(AppUser::getDelFlag, 0)
+ .eq(AppUser::getStatus, 1)
+ .page(Page.of(pageNum, pageSize));
return R.ok(page);
}
@GetMapping("/orders")
@ApiOperation(value = "用户列表-订单列表", tags = {"管理后台"})
- public R<List<Order>> orders(Long id) {
+ public R<JSONObject> orders(Long id,Integer pageNum, Integer pageSize) {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
- Integer shopId = sysUser.getObjectId();
+ Integer shopId = -1;
+ if(sysUser.getRoleType() == 2){
+ shopId = sysUser.getObjectId();
+ }
R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id,shopId);
- return R.ok(listR.getData());
-
+ List<Order> data = listR.getData();
+ Integer total = data.size();
+ // 手动分页
+ if (data != null && data.size() > 0) {
+ if (pageNum == null || pageNum == 0) {
+ pageNum = 1;
+ }
+ if (pageSize == null || pageSize == 0) {
+ pageSize = 10;
+ }
+ data = data.stream()
+ .skip((pageNum - 1) * pageSize)
+ .limit(pageSize)
+ .collect(Collectors.toList());
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("records", data);
+ jsonObject.put("total", total);
+ jsonObject.put("size", pageSize);
+ jsonObject.put("current", pageNum);
+ return R.ok(jsonObject);
}
@@ -810,15 +1017,29 @@
if (cd.getStartTime().isAfter(cd.getEndTime())) {
return R.fail("开始时间不能大于结束时间");
}
-
-
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
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>()
+ LambdaQueryWrapper<BalanceChangeRecord> queryWrapper = new LambdaQueryWrapper<BalanceChangeRecord>()
.between(BalanceChangeRecord::getCreateTime, date, date.plusDays(1))
- .eq(BalanceChangeRecord::getChangeType,4)
- .eq(BalanceChangeRecord::getVipId, i));
+ .eq(BalanceChangeRecord::getChangeType, 4)
+ .eq(BalanceChangeRecord::getVipId, i);
+ if(sysUser.getRoleType() == 2){
+ Integer objectId = sysUser.getObjectId();
+ List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getShopId, objectId).eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1));
+ List<Long> appUserIds = list.stream().map(AppUser::getId).collect(Collectors.toList());
+ Set<Long> data = orderClient.getAppUserByShoppingShop(objectId).getData();
+ if(null != data){
+ appUserIds.addAll(data);
+ }
+ if(appUserIds.size() == 0){
+ appUserIds.add(-1L);
+ }
+ queryWrapper.in(BalanceChangeRecord::getAppUserId, appUserIds);
+ }
+ List<BalanceChangeRecord> list = balanceChangeRecordService.list(queryWrapper);
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<>())
@@ -826,7 +1047,11 @@
}
for (int i = 1; i < 4; i++){
- R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, date);
+ Integer objectId = 0;
+ if(sysUser.getRoleType() == 2){
+ objectId = sysUser.getObjectId();
+ }
+ R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, objectId, date);
if (!CollectionUtils.isEmpty(r.getData())){
List<ShopBalanceStatement> list = r.getData();
BigDecimal reduce = list.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -844,7 +1069,19 @@
}
}
});
+ Integer objectId = 0;
+ if(sysUser.getRoleType() == 2){
+ objectId = sysUser.getObjectId();
+ }
+ R<Map<String, BigDecimal>> shopStatistics = shopClient.getShopStatistics(objectId);
+ Map<String, BigDecimal> data = shopStatistics.getData();
+ BigDecimal totalServiceFee = BigDecimal.ZERO;
+ BigDecimal totalUserCommission = BigDecimal.ZERO;
+ if (data != null){
+ totalServiceFee = data.get("serverGiveawayMoney");
+ totalUserCommission = data.get("giveawayMoney");
+ }
BigDecimal totalCommission = BigDecimal.ZERO;
BigDecimal totalNormalCommission = BigDecimal.ZERO;
@@ -861,47 +1098,49 @@
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);
- }
+ Set<String> keySet = dailyVipCommissions.keySet();
+ List<CommissionDate> commissionDateList = new ArrayList<>();
+ for (String key : keySet) {
+ CommissionDate commissionDate = new CommissionDate();
+ commissionDate.setDate(key);
+ Map<Integer, BigDecimal> dailyCommissions = dailyVipCommissions.get(key);
+ commissionDate.setNormalCommission(dailyCommissions.getOrDefault(1, BigDecimal.ZERO));
+ totalNormalCommission = totalNormalCommission.add(dailyCommissions.getOrDefault(1, BigDecimal.ZERO));
+
+ commissionDate.setGoldCommission(dailyCommissions.getOrDefault(2, BigDecimal.ZERO));
+ totalGoldCommission = totalGoldCommission.add(dailyCommissions.getOrDefault(2, BigDecimal.ZERO));
+
+ commissionDate.setDiamondCommission(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));
+ totalDiamondCommission = totalDiamondCommission.add(dailyCommissions.getOrDefault(3, BigDecimal.ZERO));
+
+ commissionDate.setAgentCommission(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));
+ totalAgentCommission = totalAgentCommission.add(dailyCommissions.getOrDefault(4, BigDecimal.ZERO));
+
+ commissionDate.setSuperAgentCommission(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));
+ totalSuperAgentCommission = totalSuperAgentCommission.add(dailyCommissions.getOrDefault(5, BigDecimal.ZERO));
+
+ commissionDate.setTopAgentCommission(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));
+ totalTopAgentCommission = totalTopAgentCommission.add(dailyCommissions.getOrDefault(6, BigDecimal.ZERO));
+
+ commissionDate.setPartnerCommission(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));
+ totalPartnerCommission = totalPartnerCommission.add(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));
+ commissionDateList.add(commissionDate);
}
- 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);
@@ -909,31 +1148,9 @@
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());
-
+ totalCommission = totalNormalCommission.add(totalGoldCommission).add(totalDiamondCommission).add(totalAgentCommission)
+ .add(totalSuperAgentCommission).add(totalTopAgentCommission).add(totalPartnerCommission);
+ commissionDetail.setTotalCommission(totalCommission);
commissionDetail.setCommissionDateList(commissionDateList);
return R.ok(commissionDetail);
@@ -990,7 +1207,7 @@
* 检查会员降级
* @param appUserId
*/
- @PostMapping("/app-user/vipDemotion")
+ @PostMapping("/vipDemotion")
public void vipDemotion(@RequestParam("appUserId") Long appUserId){
appUserService.vipDemotion(appUserId);
}
--
Gitblit v1.7.1