From f6716fd36c3c19de55c8f190ae5fbed88adc6dd7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 19 八月 2024 17:53:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java | 8 +
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java | 2
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/SignDayUtil.java | 76 +++++++++++++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 174 +++++++++++++++++++++++++++++++++-
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java | 3
5 files changed, 253 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
index a3e77c3..ea350ac 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
@@ -44,6 +44,9 @@
@ApiModelProperty(value = "奖励积分")
@TableField("reward_points")
private Integer rewardPoints;
+ @ApiModelProperty(value = "礼盒标记")
+ @TableField("is_gift")
+ private Integer isGift;
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
index 9e0a6bb..0d5a429 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
@@ -48,7 +48,7 @@
@TableField("invite_users_to_earn_points")
private String inviteUsersToEarnPoints;
- @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[{\"num1\":1,\"num2\":1}]}")
+ @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[\"1(多少天),2（多少分）\"]}")
@TableField("sign_in_for_points")
private String signInForPoints;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index 92e2852..3cd2e6c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -1,7 +1,10 @@
package com.ruoyi.account.controller;
-
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -11,6 +14,8 @@
import com.ruoyi.account.api.model.*;
import com.ruoyi.account.api.vo.CouponListVOVO;
import com.ruoyi.account.service.*;
+import com.ruoyi.account.util.PointDetailUtil;
+import com.ruoyi.account.util.SignDayUtil;
import com.ruoyi.account.wx.body.resp.Code2SessionRespBody;
import com.ruoyi.account.wx.body.resq.Code2SessionResqBody;
import com.ruoyi.account.wx.model.WeixinProperties;
@@ -32,9 +37,12 @@
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.api.feignClient.IntegralRuleClient;
import com.ruoyi.other.api.feignClient.OtherClient;
import com.ruoyi.system.api.domain.SysRole;
+import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.model.LoginUserApplet;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -84,6 +92,8 @@
@Resource
private TAppUserIntegralChangeService integralChangeService;
+ @Resource
+ private SignDayUtil signDayUtil;
@Resource
private ExchangeOrderClient exchangeOrderClient;
@@ -91,6 +101,12 @@
private TokenService tokenService;
@Autowired
private RedisService redisService;
+ @Autowired
+ private WeixinProperties wxConfig;
+ @Autowired
+ private RestTemplate wxRestTemplate;
+ @Resource
+ private PointDetailUtil pointDetailUtil;
@Resource
private TAppUserSignService signService;
@@ -98,6 +114,10 @@
private TAppCouponService appCouponService;
@Resource
private TAppUserCarService carService;
+ @Resource
+ private IntegralRuleClient integralRuleClient;
+
+
@ApiOperation(value = "查询当前用户是否为会员 0否1是", tags = {"小程序--查询当前用户是否为会员"})
@@ -216,6 +236,49 @@
return R.ok(page);
}
+ @ApiOperation(value = "会员列表", tags = {"用户管理-会员列表"})
+ @PostMapping(value = "/user/vip/page")
+ public R<Page<TAppUser>> vipPage(@RequestBody UserListQueryDto userListQueryDto) {
+ List<Long> userIds = new ArrayList<>();
+ //如果要筛选标签。用标签获取useids
+ if (userListQueryDto.getUserTagId() != null){
+ userIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getUserTagId, userListQueryDto.getUserTagId()).list().stream().map(TAppUserTag::getAppUserId).collect(Collectors.toList());
+ }
+ //列表查询
+ Page<TAppUser> page = appUserService.lambdaQuery()
+ .like(userListQueryDto.getUserPhone() != null && !"".equals(userListQueryDto.getUserPhone()), TAppUser::getPhone, userListQueryDto.getUserPhone())
+ .eq(userListQueryDto.getCompanyId() != null, TAppUser::getCompanyId, userListQueryDto.getCompanyId())
+ .eq(userListQueryDto.getCityCode() != null && !"".equals(userListQueryDto.getCityCode()), TAppUser::getCityCode, userListQueryDto.getCityCode())
+ .eq(userListQueryDto.getStatus() != null, TAppUser::getStatus, userListQueryDto.getStatus())
+ .eq(userListQueryDto.getVipTypeId() != null, TAppUser::getVipId, userListQueryDto.getVipTypeId())
+ .in(!userIds.isEmpty(),TAppUser::getId,userIds)
+ .page(Page.of(userListQueryDto.getPageCurr(), userListQueryDto.getPageSize()));
+ if (page.getRecords().isEmpty()){
+ return R.ok(page);
+ }
+ List<Integer> vipIds = new ArrayList<>();
+ vipIds = page.getRecords().stream().map(TAppUser::getVipId).collect(Collectors.toList());
+ //获取会员map
+ R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds);
+ //循环处理
+ for (TAppUser appUser : page.getRecords()) {
+ //拿到最新的tagId
+ TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();
+ //设置最新的tagName
+ R<TUserTag> byIdTag = otherClient.getByIdTag(one.getUserTagId());
+ if (byIdTag.getData()!=null) {
+ appUser.setTagName(byIdTag.getData().getName());
+ }
+ //匹配vipMap的值
+ appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
+ //累计充电次数
+ R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
+ appUser.setOrderCount(useOrderCount.getData());
+
+ }
+ return R.ok(page);
+ }
+
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券发放-选择人员")
@PostMapping("/choiceUser")
public R<Page<TAppUser>> choiceUser(@RequestBody ChoiceUserListQueryDto userListQueryDto) {
@@ -323,7 +386,9 @@
List<Integer> tagIds = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, id).orderByDesc(TAppUserTag::getCreateTime).list().stream().map(TAppUserTag::getUserTagId).collect(Collectors.toList());
R<Map<Integer, String>> tagMap = otherClient.getTagMap(tagIds);
- userDetailDto.setTagName(tagMap.getData().values().toString());
+ userDetailDto.setTagName(tagMap.getData().values()
+ .stream()
+ .collect(Collectors.joining(",")));
return R.ok(userDetailDto);
}
@@ -537,10 +602,105 @@
.last("LIMIT 1")));
}
-// @ApiOperation(value = "签到", tags = {"小程序-个人中心-签到"})
-// @PostMapping(value = "/user/sign")
-// public R sign() {
-//
-// }
+ @ApiOperation(value = "签到", tags = {"小程序-个人中心-签到"})
+ @PostMapping(value = "/user/sign")
+ public R sign() {
+ LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
+ Long userId = loginUserApplet.getUserId();
+
+ TAppUser byId = appUserService.getById(userId);
+
+
+ if (signService.lambdaQuery().eq(TAppUserSign::getSignDay, LocalDate.now()).eq(TAppUserSign::getAppUserId, userId).count()>0){
+ return R.fail("今日已签到");
+ }
+ //签到业务
+ TAppUserSign appUserSign = new TAppUserSign();
+ appUserSign.setSignDay(LocalDate.now());
+ appUserSign.setRewardPoints(2);
+ appUserSign.setCreateTime(LocalDateTime.now());
+ appUserSign.setAppUserId(userId);
+ signService.save(appUserSign);
+ //签到加积分记录
+ R<TIntegralRule> set = integralRuleClient.getSet();
+ TIntegralRule data = set.getData();
+ JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+ //增加每日积分
+ Integer points = 0;
+ Integer point = jsonObject.getInteger("num1");
+ points= points+point;
+ JSONArray num2 = jsonObject.getJSONArray("num2");
+ if (num2!=null) {
+ //获取连续签到的规则放入map
+ Map<Integer,Integer> map = new HashMap<>();
+ for (Object o : num2) {
+ String o1 = (String) o;
+ String[] split = o1.split(",");
+ map.put(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
+ }
+ //加上今日签到，计算连续了多少天，如果到达就增加奖励的分数
+ int days = signDayUtil.calculateContinuousSignDays(userId);
+ Integer i = map.get(days);
+ if (i!=null){
+ points= points+i;
+ appUserSign.setIsGift(1);
+ signService.updateById(appUserSign);
+ }
+ }
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+points,1,userId,"每日签到","");
+ byId.setPoints(byId.getPoints()+points);
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
+ @PostMapping(value = "/user/car/addOrUpdate")
+ public R carAdd(@RequestBody TAppUserCar appUserCar) {
+
+ LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
+ Long userId = loginUserApplet.getUserId();
+ TAppUser byId = appUserService.getById(userId);
+
+
+ //如果是第一次添加车辆，增加积分
+ Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
+
+
+ if (count==0){
+ R<TIntegralRule> set = integralRuleClient.getSet();
+ TIntegralRule data = set.getData();
+ JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+
+
+ Integer point = 0;
+ //增加车牌50分，必填
+ point = point+jsonObject.getInteger("num1");
+ //增加车型分
+ if (StringUtils.isNotEmpty(appUserCar.getVehicleModel())){
+ point = point+jsonObject.getInteger("num2");
+ }
+ //增加车辆用途分
+ if (StringUtils.isNotEmpty(appUserCar.getVehicleUse())){
+ point = point+jsonObject.getInteger("num3");
+ }
+ //增加续航分
+ if (StringUtils.isNotEmpty(appUserCar.getEndurance())){
+ point = point+jsonObject.getInteger("num4");
+ }
+
+ //增加积分记录
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"");
+ byId.setPoints(byId.getPoints()+point);
+ appUserService.updateById(byId);
+
+
+ }
+
+ //
+ appUserCarService.saveOrUpdate(appUserCar);
+
+ return R.ok();
+ }
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/SignDayUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/SignDayUtil.java
new file mode 100644
index 0000000..5a287f5
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/SignDayUtil.java
@@ -0,0 +1,76 @@
+package com.ruoyi.account.util;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.ruoyi.account.api.model.TAppUserSign;
+import com.ruoyi.account.service.TAppUserSignService;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+@Component
+public class SignDayUtil {
+
+ // 假设这是你的 signService 接口或者实现类
+ @Resource
+ private TAppUserSignService signService;
+
+ /**
+ * 计算用户的最近连续签到天数
+ * @param userId 用户ID
+ * @return 连续签到的最大天数
+ */
+ public int calculateContinuousSignDays(Long userId) {
+ DateTime startOfMonth = DateUtil.beginOfMonth(new Date());
+ DateTime endOfMonth = DateUtil.endOfMonth(new Date());
+ // 获取用户的所有签到记录
+ List<TAppUserSign> signRecords = signService.lambdaQuery()
+ .between(TAppUserSign::getSignDay, startOfMonth, endOfMonth)
+ .eq(TAppUserSign::getAppUserId, userId)
+ .orderByDesc(TAppUserSign::getSignDay)
+ .list();
+
+ // 如果没有签到记录，则返回0
+ if (signRecords.isEmpty()) {
+ return 0;
+ }
+
+ // 将签到日期转换为 LocalDate 列表，并按照日期排序
+ List<LocalDate> signDays = signRecords.stream()
+ .map(TAppUserSign::getSignDay)
+ .sorted()
+ .collect(Collectors.toList());
+
+ // 计算连续签到的最大天数
+ return calculateMaxContinuousSignDays(signDays);
+ }
+
+ /**
+ * 根据签到日期列表计算连续签到的最大天数
+ * @param signDays 签到日期列表
+ * @return 最大连续签到天数
+ */
+ private int calculateMaxContinuousSignDays(List<LocalDate> signDays) {
+ int maxContinuousDays = 0;
+ int currentContinuousDays = 0;
+ LocalDate lastSignDay = null;
+
+ for (LocalDate signDay : signDays) {
+ if (lastSignDay != null && signDay.equals(lastSignDay.plusDays(1))) {
+ currentContinuousDays++;
+ } else {
+ maxContinuousDays = Math.max(maxContinuousDays, currentContinuousDays);
+ currentContinuousDays = 1;
+ }
+ lastSignDay = signDay;
+ }
+
+ // 更新最后的连续天数
+ maxContinuousDays = Math.max(maxContinuousDays, currentContinuousDays);
+
+ return maxContinuousDays;
+ }
+}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
index fdadabc..de7171d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
@@ -71,8 +71,12 @@
.ge(TNotice::getEndTime, LocalDateTime.now())
.like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
.page(Page.of(query.getPageCurr(),query.getPageSize())));
- }
- return AjaxResult.success();
+ }else{
+ return AjaxResult.success(noticeService.lambdaQuery()
+ .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+ .page(Page.of(query.getPageCurr(),query.getPageSize())));
+ }
+
}
--
Gitblit v1.7.1