From 533c26ca01cee2e0883cd43ad808bc3267937db8 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 02 九月 2024 19:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 220 insertions(+), 17 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 3b308f8..93d83d5 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,9 +112,24 @@
@Resource
private VipClient vipClient;
+ @Resource
+ private TInviteUserService inviteUserService;
-
+ /**
+ * 远程调用 积分兑换订单 退款回退积分
+ * @return
+ */
+ @PostMapping(value = "/refundPoints/{param}")
+ public R refundPoints(@PathVariable("param")String param) {
+ String[] split = param.split("-");
+ String userId = split[0];
+ String points = split[1];
+ TAppUser byId = appUserService.getById(userId);
+ byId.setPoints(byId.getPoints()+Integer.parseInt(points));
+ appUserService.updateById(byId);
+ return R.ok();
+ }
@ApiOperation(value = "查询当前用户是否为会员 0否1是", tags = {"小程序--查询当前用户是否为会员"})
@PostMapping(value = "/getUserInfo")
@@ -321,6 +340,7 @@
//累计充电次数
R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
appUser.setOrderCount(useOrderCount.getData());
+ appUser.setUid(appUser.getId().toString());
}
return R.ok(page);
@@ -399,6 +419,9 @@
@ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表","小程序-个人中心"})
@PostMapping(value = "/user/points/page")
public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) {
+ if (pointsQueryDto.getUserId()==null){
+ pointsQueryDto.setUserId(tokenService.getLoginUserApplet().getUserId());
+ }
List<Integer> types = new ArrayList<>();
if (pointsQueryDto.getType()!=null){
types.add(1);
@@ -414,6 +437,8 @@
.in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
for (TAppUserIntegralChange record : page.getRecords()) {
+ record.setDateTime(record.getCreateTime());
+ record.setUid(record.getId().toString());
if (record.getChangeType()==2){
R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
if (tChargingOrderR.getData()!=null) {
@@ -430,6 +455,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 = {"后台-用户管理-用户列表"})
@@ -481,39 +513,83 @@
appUserInfoDto.setVipExpireTime(byId.getVipEndTime());
}
//判断当天是否签到
- Long count = signService.lambdaQuery().eq(TAppUserSign::getSignDay, LocalDate.now()).count();
+ Long count = signService.lambdaQuery().eq(TAppUserSign::getAppUserId,userId).eq(TAppUserSign::getSignDay, LocalDate.now()).count();
appUserInfoDto.setIsSign(count>0?1:0);
//获取当前拥有的优惠卷数量
Long coupons = appCouponService.lambdaQuery().eq(TAppCoupon::getAppUserId, userId).eq(TAppCoupon::getStatus, 1).count();
appUserInfoDto.setCouponNum(Math.toIntExact(coupons));
//当前绑定的车辆
List<TAppUserCar> list = carService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).list();
+ for (TAppUserCar tAppUserCar : list) {
+ tAppUserCar.setUid(tAppUserCar.getId().toString());
+ }
appUserInfoDto.setUserCars(list);
+ appUserInfoDto.setFirstAdd(byId.getFirstAdd()!=null?byId.getFirstAdd():0);
+ appUserInfoDto.setPoints(byId.getPoints()==null?0:byId.getPoints());
return R.ok(appUserInfoDto);
}
@ApiOperation(value = "优惠卷列表不分页（1可使用2不可用）", tags = {"小程序-个人中心"})
- @PostMapping(value = "/user/coupon")
- public R<List<InfoCouponDto>> userCoupon(@RequestParam("type") Integer type) {
+ @GetMapping(value = "/user/coupon")
+ public R<ListInfoCouponDto> userCoupon(@RequestParam("type") Integer type) {
+ Long userId = tokenService.getLoginUserApplet().getUserId();
LocalDateTime now = LocalDateTime.now();
- List<InfoCouponDto> couponDtos = new ArrayList<>();
- List<TAppCoupon> list = appCouponService.lambdaQuery().le(TAppCoupon::getStartTime, now).ge(TAppCoupon::getEndTime, now).eq(TAppCoupon::getStatus, type).list();
- for (TAppCoupon tAppCoupon : list) {
+ List<InfoCouponDto> couponDtos1 = new ArrayList<>();
+
+ List<TAppCoupon> list = appCouponService.lambdaQuery().eq(TAppCoupon::getAppUserId, userId).ge(TAppCoupon::getEndTime, now).eq(TAppCoupon::getStatus, 1).list();
+ for (TAppCoupon tAppCoupon : list) {
+ TCoupon coupon = JSON.toJavaObject(JSON.parseObject(tAppCoupon.getCouponJson()), TCoupon.class);
+ InfoCouponDto infoCouponDto = new InfoCouponDto();
+ BeanUtils.copyProperties(coupon, infoCouponDto);
+ infoCouponDto.setId(tAppCoupon.getId().toString());
+ infoCouponDto.setEndTime(tAppCoupon.getEndTime());
+ couponDtos1.add(infoCouponDto);
+
+ }
+
+ List<TAppCoupon> list1 = appCouponService.lambdaQuery().eq(TAppCoupon::getAppUserId, userId).eq(TAppCoupon::getStatus, 2).list();
+ List<TAppCoupon> list2 = appCouponService.lambdaQuery().eq(TAppCoupon::getAppUserId, userId).lt(TAppCoupon::getEndTime, now).list();
+
+ List<InfoCouponDto> couponDtos2 = new ArrayList<>();
+ for (TAppCoupon tAppCoupon : list1) {
TCoupon coupon = JSON.toJavaObject(JSON.parseObject(tAppCoupon.getCouponJson()), TCoupon.class);
InfoCouponDto infoCouponDto = new InfoCouponDto();
- BeanUtils.copyProperties(coupon,infoCouponDto);
- infoCouponDto.setId(tAppCoupon.getId());
- couponDtos.add(infoCouponDto);
-
+ BeanUtils.copyProperties(coupon, infoCouponDto);
+ infoCouponDto.setId(tAppCoupon.getId().toString());
+ infoCouponDto.setEndTime(tAppCoupon.getEndTime());
+ couponDtos2.add(infoCouponDto);
+ }
+ for (TAppCoupon tAppCoupon : list2) {
+ TCoupon coupon = JSON.toJavaObject(JSON.parseObject(tAppCoupon.getCouponJson()), TCoupon.class);
+ InfoCouponDto infoCouponDto = new InfoCouponDto();
+ BeanUtils.copyProperties(coupon, infoCouponDto);
+ infoCouponDto.setId(tAppCoupon.getId().toString());
+ infoCouponDto.setEndTime(tAppCoupon.getEndTime());
+ couponDtos2.add(infoCouponDto);
}
- return R.ok(couponDtos);
+ ListInfoCouponDto listInfoCouponDto = new ListInfoCouponDto();
+ if (type==1){
+ listInfoCouponDto.setInfoCouponDtoList(couponDtos1);
+ }else {
+ listInfoCouponDto.setInfoCouponDtoList(couponDtos2);
+ }
+ listInfoCouponDto.setNum1(couponDtos1.size());
+ listInfoCouponDto.setNum2(couponDtos2.size());
+ return R.ok(listInfoCouponDto);
+
+ }
+ @ApiOperation(value = "优惠卷详情（1可使用2不可用）", tags = {"小程序-个人中心"})
+ @GetMapping(value = "/user/coupon/getById")
+ public R<TAppCoupon> couponGetById(@RequestParam("id")Long id) {
+ TAppCoupon appCoupon = appCouponService.getById(id);
+ return R.ok(appCoupon);
}
@@ -537,18 +613,43 @@
}
//增加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 = {"小程序-个人中心-邀请好友"})
+ @GetMapping(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")
public AjaxResult<String> updatePhone(@Validated @RequestBody UpdatePhoneDTO dto) {
- String code = redisService.getCacheObject(dto.getPhone() + Constants.APPLET);
+ String code = redisService.getCacheObject(dto.getPhone() + Constants.UPDATE_PHONE);
if(StringUtils.isEmpty(code)){
return AjaxResult.error("验证码已过期,请重新获取验证码!");
}
@@ -675,6 +776,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);
+ }
+
//积分变化记录用
@@ -687,6 +817,15 @@
return R.ok();
}
+ @PostMapping(value = "/user/points/change/down")
+ public R changeDown(@RequestBody PointChangeDto points) {
+ TAppUser byId = appUserService.getById(points.getUserId());
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()-points.getPoints(),points.getType(),points.getUserId(),points.getRemark(),"JF");
+ byId.setPoints(byId.getPoints()-points.getPoints());
+ appUserService.updateById(byId);
+ return R.ok();
+ }
+
@ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
@PostMapping(value = "/user/car/addOrUpdate")
public R carAdd(@RequestBody TAppUserCar appUserCar) {
@@ -694,7 +833,7 @@
LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
Long userId = loginUserApplet.getUserId();
TAppUser byId = appUserService.getById(userId);
-
+ appUserCar.setAppUserId(userId);
//如果是第一次添加车辆，增加积分
Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
@@ -725,6 +864,7 @@
//增加积分记录
pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"");
byId.setPoints(byId.getPoints()+point);
+ byId.setFirstAdd(1);
appUserService.updateById(byId);
@@ -735,5 +875,68 @@
return R.ok();
}
+ @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/delete")
+ public R carDelete(String id) {
+ boolean b = appUserCarService.removeById(id);
+ return R.ok();
+ }
+ @ApiOperation(value = "车辆详情", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/detail")
+ public R<TAppUserCar> carDetail(String id) {
+ TAppUserCar byId = appUserCarService.getById(id);
+ return R.ok(byId);
+ }
+
+ @ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/getBrands")
+ public R getBrands(String name) throws Exception {
+ String brand = CarBrandUtil.getBrand();
+ JSONObject jsonObject = JSON.parseObject(brand);
+ JSONArray data = jsonObject.getJSONArray("data");
+ return R.ok(data);
+
+ }
+
+ @ApiOperation(value = "根据品牌获取车系", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/getModel")
+ public R getModel(String id) throws Exception {
+ String modelById = CarBrandUtil.getModelById(id);
+ JSONObject jsonObject = JSON.parseObject(modelById);
+ JSONArray data = jsonObject.getJSONArray("data");
+ JSONArray backList = new JSONArray();
+ for (Object datum : data) {
+ JSONObject jsonObject1 = JSON.parseObject(datum.toString());
+ JSONArray list = jsonObject1.getJSONArray("list");
+ backList.addAll(list);
+ }
+ return R.ok(backList);
+ }
+ @ApiOperation(value = "根据车系获取车型", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/getSeries")
+ public R getSeries(String id) throws Exception {
+ String modelById = CarBrandUtil.getSeriesById(id);
+ JSONObject jsonObject = JSON.parseObject(modelById);
+ JSONObject data1 = jsonObject.getJSONObject("data");
+ JSONArray data = data1.getJSONArray("list");
+// JSONArray data = jsonObject.getJSONArray(data1.get("list").toString());
+// JSONArray backList = new JSONArray();
+// for (Object datum : data) {
+// JSONObject jsonObject1 = JSON.parseObject(datum.toString());
+// JSONArray list = jsonObject1.getJSONArray("list");
+// backList.addAll(jsonObject1);
+// }
+ return R.ok(data);
+
+ }
+
+ @ApiOperation(value = "根据车型获取详情", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/getDetail")
+ public R getDetail(String id) throws Exception {
+ String detailById = CarBrandUtil.getDetailById(id);
+ JSONObject jsonObject = JSON.parseObject(detailById);
+
+ return R.ok(jsonObject.getJSONObject("data"));
+ }
}
--
Gitblit v1.7.1