From 4f97bdbaadcdc19df9dfb0971b930d799c4aeddc Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 13 三月 2025 14:52:26 +0800
Subject: [PATCH] 迭代版本：2.28
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 320 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 204 insertions(+), 116 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
index bb4bdf1..60b63e3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -22,17 +22,14 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.common.redis.annotation.DistributedLock;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.feignClient.OrderClient;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.feignClient.*;
-import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.core.util.UuidUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@@ -111,6 +108,9 @@
private RedisTemplate redisTemplate;
@Resource
private BalancePaymentService balancePaymentService;
+
+ @Resource
+ private OrderClient orderClient;
/**
@@ -257,12 +257,12 @@
@Override
public R<LoginVo> registerAccount(RegisterAccount registerAccount) {
//校验验证码
- String code = redisService.getCacheObject(registerAccount.getPhone());
- if(!"999999".equals(registerAccount.getCode())){
- if(null == code || !code.equals(registerAccount.getCode())){
- return R.fail("验证码错误");
- }
- }
+// String code = redisService.getCacheObject(registerAccount.getPhone());
+// if(!"999999".equals(registerAccount.getCode())){
+// if(null == code || !code.equals(registerAccount.getCode())){
+// return R.fail("验证码错误");
+// }
+// }
//使用jscode获取微信openid
Map<String, Object> map = weChatUtil.code2Session(registerAccount.getJscode());
Integer errcode = Integer.valueOf(map.get("errcode").toString());
@@ -282,6 +282,12 @@
if(null != appUser1 && appUser1.getStatus() == 2){
return R.fail("手机号已注册，请直接登录！");
}
+
+ String avatar = registerAccount.getAvatar();
+ if (StringUtils.isEmpty(avatar)){
+ avatar = "http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/admin/aedfbbb41280471f8d9fa7905298b65f.png";
+ }
+
//如果手机号已注册，但是没有微信号，则将微信号添加到已有账户上
if(null != appUser1 && StringUtils.isEmpty(appUser1.getWxOpenid())){
appUser1.setWxOpenid(openid);
@@ -289,7 +295,7 @@
appUser = appUser1;
}else if(null == appUser){
appUser = new AppUser();
- appUser.setAvatar(registerAccount.getAvatar());
+ appUser.setAvatar(avatar);
appUser.setName(registerAccount.getName());
appUser.setPhone(registerAccount.getPhone());
appUser.setWxOpenid(openid);
@@ -400,6 +406,7 @@
}
userCoupon.setStartTime(start);
userCoupon.setEndTime(end);
+ userCoupon.setCouponInfo(JSON.toJSONString(couponInfo));
userCouponService.save(userCoupon);
}
}
@@ -464,8 +471,8 @@
//获取微信推广二维码
String fileName = UUID.randomUUID() + ".jpg";
- weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + appUser.getId(), EnvVersion.TRIAL, filePath + fileName);
- appUser.setQrCode(accessPath + fileName);
+ String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/start/start", "id=" + appUser.getId(), EnvVersion.RELEASE, filePath + fileName);
+ appUser.setQrCode(getwxacodeunlimit);
this.updateById(appUser);
}
@@ -482,8 +489,8 @@
loginVo.setFailureTime(Long.valueOf(tokenApplet.get("expires_in").toString()));
return R.ok(loginVo);
}
-
-
+
+
/**
* 会员等级变化
*/
@@ -607,6 +614,130 @@
}
}
}
+
+ public void vipConsumption(Long id){
+
+ System.out.println("1111111111111111111111");
+
+ AppUser appUser = this.getById(id);
+ System.out.println("消费积分："+ appUser.getShopPoint());
+ System.out.println("返佣积分："+ appUser.getSharePoint() );
+ Integer vipId = appUser.getVipId();
+ //钻石会员
+ VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData();
+ //消费积分满足升级
+ if(1 == vipSetting3.getVipLevelUpShopRole() && appUser.getShopPoint() >= vipSetting3.getVipLevelUpShop() && appUser.getVipId() < 3){
+ appUser.setVipId(3);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //返佣积分满足升级
+ if(1 == vipSetting3.getVipLevelUpShareRole() && appUser.getSharePoint() >= vipSetting3.getVipLevelUpShare() && appUser.getVipId() < 3){
+ appUser.setVipId(3);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //下级人数满足升级
+ Integer vipLevelUpNumRole = vipSetting3.getVipLevelUpNumRole();
+ Integer vipDirectNum = vipSetting3.getVipDirectNum();
+ Integer vipTeamNum = vipSetting3.getVipTeamNum();
+ if(1 == vipLevelUpNumRole && appUser.getVipId() < 3){
+ //查询直推用户达到X人或者团队人数达到X人后，可升级
+ //直推用户数
+ long count = this.count(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1).eq(AppUser::getInviteUserId, id));
+ //团队用户数
+ List<AppUser> subordinate = getSubordinate(id);
+ if(vipDirectNum <= count || vipTeamNum <= subordinate.size()){
+ appUser.setVipId(3);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ }
+
+ //黄金会员
+ VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
+ //消费积分满足升级
+ if(1 == vipSetting2.getVipLevelUpShopRole() && appUser.getShopPoint() >= vipSetting2.getVipLevelUpShop() && appUser.getVipId() < 2){
+ appUser.setVipId(2);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //返佣积分满足升级
+ if(1 == vipSetting2.getVipLevelUpShareRole() && appUser.getSharePoint() >= vipSetting2.getVipLevelUpShare() && appUser.getVipId() < 2){
+ appUser.setVipId(2);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ return;
+ }
+ //下级人数满足升级
+ vipLevelUpNumRole = vipSetting2.getVipLevelUpNumRole();
+ vipDirectNum = vipSetting2.getVipDirectNum();
+ vipTeamNum = vipSetting2.getVipTeamNum();
+ if(1 == vipLevelUpNumRole && appUser.getVipId() < 2){
+ //查询直推用户达到X人或者团队人数达到X人后，可升级
+ //直推用户数
+ long count = this.count(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1).eq(AppUser::getInviteUserId, id));
+ //团队用户数
+ List<AppUser> subordinate = getSubordinate(id);
+ if(vipDirectNum <= count || vipTeamNum <= subordinate.size()){
+ appUser.setVipId(2);
+ this.updateById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogService.save(userChangeLog);
+ }
+ }
+ }
/**
* 处理会员降级
@@ -673,7 +804,7 @@
return;
}
}
- if(appUser.getVipId() > 2){
+ if(appUser.getVipId() >= 2){
appUser.setVipId(1);
this.updateById(appUser);
//添加等级变化记录
@@ -865,7 +996,6 @@
@Override
public void unbindThePromoter() {
//注册X天后没有升级成黄金会员则自动解绑推广人
-
//解绑推广人
Set<Long> unbind_promoter = redisTemplate.opsForZSet().rangeByScore("unbind_promoter", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
if(unbind_promoter.size() > 0){
@@ -876,16 +1006,21 @@
updateWrapper.set("invite_user_id", null).set("shop_id", null).eq("id", appUser.getId());
this.update(updateWrapper);
}
+ redisTemplate.opsForZSet().remove("unbind_promoter", unbind_promoter.toArray());
}
//可更换推广人
Set<Long> replaceable = redisTemplate.opsForZSet().rangeByScore("replaceable", 0, LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
if(replaceable.size() > 0){
List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getChangePromoter, 0)
- .eq(AppUser::getStatus, 1).in(AppUser::getId, unbind_promoter));
+ .eq(AppUser::getStatus, 1).in(AppUser::getId, replaceable));
for (AppUser appUser : list) {
- appUser.setChangePromoter(1);
- this.updateById(appUser);
+ Long data = orderClient.getOrderCountByAppUserId(appUser.getId()).getData();
+ if(data == 0L){
+ appUser.setChangePromoter(1);
+ this.updateById(appUser);
+ }
}
+ redisTemplate.opsForZSet().remove("replaceable", replaceable.toArray());
}
}
@@ -898,13 +1033,20 @@
Long userid = tokenService.getLoginUserApplet().getUserid();
Object cacheObject = redisService.getCacheObject("ONLINE_" + userid);
if(null == cacheObject){
- redisService.setCacheObject("ONLINE_" + userid, System.currentTimeMillis(), 1L, TimeUnit.HOURS);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("time", System.currentTimeMillis());
+ jsonObject.put("online", 0);
+ redisService.setCacheObject("ONLINE_" + userid, jsonObject, 1L, TimeUnit.HOURS);
}else{
- Long duration = (Long) cacheObject;
- long time = (System.currentTimeMillis() - duration) / 3600000;
+ JSONObject jsonObject = (JSONObject) cacheObject;
+ long time = System.currentTimeMillis() - jsonObject.getInteger("time");
+ Integer online = jsonObject.getInteger("online");
+ online += 10;
//满足一个小时，开始发放积分，计时归0
- if(1 >= time){
- redisService.setCacheObject("ONLINE_" + userid, System.currentTimeMillis(), 1L, TimeUnit.HOURS);
+ if(time >= 3600000L && 60 <= online){
+ jsonObject.put("time", System.currentTimeMillis());
+ jsonObject.put("online", 0);
+ redisService.setCacheObject("ONLINE_" + userid, jsonObject, 1L, TimeUnit.HOURS);
AppUser appUser = this.getById(userid);
PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
if(null != pointSetting){
@@ -937,6 +1079,9 @@
//变更等级
vipUpgrade(appUser.getId());
}
+ }else{
+ jsonObject.put("online", online);
+ redisService.setCacheObject("ONLINE_" + userid, jsonObject, 1L, TimeUnit.HOURS);
}
}
}
@@ -949,6 +1094,8 @@
Set<Integer> shopIds = shopR.getData();
if (!CollectionUtils.isEmpty(shopIds)){
appUser.setShopIds(shopIds);
+ }else {
+ return new Page<>();
}
}
}
@@ -967,97 +1114,33 @@
public void demotionDetection() {
//代理
List<AppUser> appUserList = new ArrayList<>();
- VipSetting vipSetting = vipSettingClient.getVipSetting(5).getData();
- List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, 5).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
- for (AppUser appUser : list) {
- //消费积分
- 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);
- appUserList.add(appUser);
- continue;
- }
- //返佣积分
- 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);
- appUserList.add(appUser);
- continue;
- }
- //门店业绩
- 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);
- appUserList.add(appUser);
- }
- }
- if(appUserList.size() > 0){
- this.updateBatchById(appUserList);
- }
-
- //总代
- appUserList = new ArrayList<>();
- vipSetting = vipSettingClient.getVipSetting(6).getData();
- list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, 6).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
- for (AppUser appUser : list) {
- //消费积分
- 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);
- appUserList.add(appUser);
- continue;
- }
- //返佣积分
- 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);
- appUserList.add(appUser);
- continue;
- }
- //门店业绩
- 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);
- appUserList.add(appUser);
- }
- }
- if(appUserList.size() > 0){
- this.updateBatchById(appUserList);
- }
-
- //合伙人
- appUserList = new ArrayList<>();
- vipSetting = vipSettingClient.getVipSetting(7).getData();
- list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, 7).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
- for (AppUser appUser : list) {
- //消费积分
- 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);
- appUserList.add(appUser);
- continue;
- }
- //返佣积分
- 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);
- appUserList.add(appUser);
- continue;
- }
- //门店业绩
- 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);
- appUserList.add(appUser);
+ for (int i = 5; i < 8; i++) {
+ VipSetting vipSetting = vipSettingClient.getVipSetting(i).getData();
+ List<AppUser> list = this.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getVipId, i).eq(AppUser::getStatus, 1).eq(AppUser::getDelFlag, 0).eq(AppUser::getIsDanger, 0));
+ for (AppUser appUser : list) {
+ //消费积分
+ 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);
+ appUserList.add(appUser);
+ continue;
+ }
+ //返佣积分
+ 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);
+ appUserList.add(appUser);
+ continue;
+ }
+ //门店业绩
+ 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);
+ appUserList.add(appUser);
+ }
}
}
if(appUserList.size() > 0){
@@ -1093,4 +1176,9 @@
}
}
}
+
+ @Override
+ public List<AppUser> getAppUserByPhoneNoFilter(String phone) {
+ return this.baseMapper.getAppUserByPhoneNoFilter(phone);
+ }
}
--
Gitblit v1.7.1