From 4fe0ca21f984b38e24df69be4443c30341ee8efb Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 24 八月 2024 16:38:26 +0800
Subject: [PATCH] 8.24.2
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 4 deletions(-)
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 b74dc0c..1a701f0 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,5 +1,7 @@
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;
@@ -11,6 +13,7 @@
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.PointDetailUtil;
import com.ruoyi.account.util.SignDayUtil;
+import com.ruoyi.account.util.carBrand.CarBrandUtil;
import com.ruoyi.account.wx.model.WeixinProperties;
import com.ruoyi.account.util.GiveVipUtil;
import com.ruoyi.common.core.constant.Constants;
@@ -22,6 +25,7 @@
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BasePojo;
+import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
@@ -108,6 +112,8 @@
@Resource
private VipClient vipClient;
+ @Resource
+ private TInviteUserService inviteUserService;
@@ -414,6 +420,7 @@
.in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
for (TAppUserIntegralChange record : page.getRecords()) {
+ record.setUid(record.getId().toString());
if (record.getChangeType()==2){
R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
if (tChargingOrderR.getData()!=null) {
@@ -430,6 +437,13 @@
return R.ok(page);
+ }
+
+ @ApiOperation(value = "积分详情", tags = {"小程序-个人中心"})
+ @GetMapping(value = "/user/points/detail")
+ public R<TAppUserIntegralChange> pointsDetail(String id) {
+ TAppUserIntegralChange byId = integralChangeService.getById(id);
+ return R.ok(byId);
}
@ApiOperation(value = "冻结解冻用户", tags = {"后台-用户管理-用户列表"})
@@ -516,6 +530,13 @@
}
+ @ApiOperation(value = "优惠卷列表不分页（1可使用2不可用）", tags = {"小程序-个人中心"})
+ @PostMapping(value = "/user/coupon/getById")
+ public R<TAppCoupon> couponGetById(@RequestParam("id")Long id) {
+ TAppCoupon appCoupon = appCouponService.getById(id);
+ return R.ok(appCoupon);
+ }
+
@ApiOperation(value = "赠送会员", tags = {"用户管理-用户列表"})
@@ -537,13 +558,38 @@
}
//增加vipDetail
giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay);
-
-
appUserService.updateById(nowUser);
- //执行一次赠送优惠卷的定时任务
}
return R.ok();
}
+
+ @ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"})
+ @PostMapping(value = "/user/invite/page")
+ public R<Page<TInviteUser>> invitePage(@RequestBody BasePage basePage) {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+
+ Page<TInviteUser> page = inviteUserService.lambdaQuery().eq(TInviteUser::getAppUserId, userId).isNotNull(TInviteUser::getAward).orderByDesc(TInviteUser::getCreateTime).page(Page.of(basePage.getPageCurr(), basePage.getPageSize()));
+ return R.ok(page);
+ }
+
+ @ApiOperation(value = "已赠送列表", tags = {"小程序-个人中心-邀请好友"})
+ @PostMapping(value = "/user/invite/info")
+ public R<InviteInfoDto> inviteInfo() {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ Integer point = 0;
+ List<TInviteUser> list = inviteUserService.lambdaQuery().eq(TInviteUser::getAppUserId, userId).isNotNull(TInviteUser::getAward).orderByDesc(TInviteUser::getCreateTime).list();
+ for (TInviteUser tInviteUser : list) {
+ point = point +tInviteUser.getAward();
+ }
+ InviteInfoDto inviteInfoDto = new InviteInfoDto();
+ inviteInfoDto.setPoint(point);
+ inviteInfoDto.setInviteNum(list.size());
+
+
+ return R.ok(inviteInfoDto);
+ }
+
+
@ApiOperation(value = "更换手机号", tags = {"小程序-用户管理-更换手机号"})
@PostMapping(value = "/user/updatePhone")
@@ -647,7 +693,7 @@
//签到加积分记录
R<TIntegralRule> set = integralRuleClient.getSet();
TIntegralRule data = set.getData();
- JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+ JSONObject jsonObject = JSON.parseObject(data.getSignInForPoints());
//增加每日积分
Integer points = 0;
Integer point = jsonObject.getInteger("num1");
@@ -675,6 +721,35 @@
appUserService.updateById(byId);
return R.ok();
}
+ //已签到日期
+ @ApiOperation(value = "本月已签到日期", tags = {"小程序-个人中心-签到"})
+ @GetMapping(value = "/user/has/sign")
+ public R<List<TAppUserSign>> hasSign() {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ 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();
+ return R.ok(signRecords);
+
+ }
+
+
+
+ //已连续签到多少天
+
+ @ApiOperation(value = "本月已连续签到天数", tags = {"小程序-个人中心-签到"})
+ @GetMapping(value = "/user/continue/sign")
+ public R continueSign() {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ int days = signDayUtil.calculateContinuousSignDays(userId);
+ return R.ok(days);
+ }
+
//积分变化记录用
@@ -735,5 +810,18 @@
return R.ok();
}
+ @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
+ @DeleteMapping(value = "/user/car/delete")
+ public R carDelete(String id) {
+ boolean b = appUserCarService.removeById(id);
+ return R.ok();
+ }
+
+ @ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/getBrands")
+ public R getBrands() throws Exception {
+ String brand = CarBrandUtil.getBrand();
+ return R.ok(brand);
+ }
}
--
Gitblit v1.7.1