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 | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 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 c228596..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
@@ -401,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) {
@@ -418,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());
@@ -461,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)){
@@ -740,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);
@@ -1054,11 +1078,9 @@
Map<String, BigDecimal> data = shopStatistics.getData();
BigDecimal totalServiceFee = BigDecimal.ZERO;
BigDecimal totalUserCommission = BigDecimal.ZERO;
- BigDecimal lowerLevelGiveawayMoney = BigDecimal.ZERO;
if (data != null){
totalServiceFee = data.get("serverGiveawayMoney");
totalUserCommission = data.get("giveawayMoney");
- lowerLevelGiveawayMoney = data.get("lowerLevelGiveawayMoney");
}
BigDecimal totalCommission = BigDecimal.ZERO;
@@ -1119,7 +1141,6 @@
CommissionDetail commissionDetail = new CommissionDetail();
commissionDetail.setTotalServiceFee(totalServiceFee);
commissionDetail.setTotalUserCommission(totalUserCommission);
- commissionDetail.setLowerLevelGiveawayMoney(lowerLevelGiveawayMoney);
commissionDetail.setTotalNormalCommission(totalNormalCommission);
commissionDetail.setTotalGoldCommission(totalGoldCommission);
commissionDetail.setTotalDiamondCommission(totalDiamondCommission);
--
Gitblit v1.7.1