From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 92 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 35 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 737d3b2..2d3f6df 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -29,7 +29,6 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -105,36 +104,36 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+
@PostMapping("/pay")
@ApiOperation(value = "购买会员支付操作", tags = {"家长端-个人中心"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
- @ApiImplicitParam(name = "payType", value = "支付类型 1=微信 2=支付宝", required = true),
- @ApiImplicitParam(name = "orderId", value = "订单id", required = true),
- @ApiImplicitParam(name = "id", value = "会员规格id", required = true),
+
})
- public AjaxResult pay(Integer payType, Integer orderId, Integer id) throws Exception {
- TVipOrder tVipOrder = vipOrderService.getById(orderId);
- switch (payType) {
+ public AjaxResult pay(@RequestBody PayDTO dto) throws Exception {
+ TVipOrder tVipOrder = vipOrderService.getById(dto.getOrderId());
+ switch (dto.getPayType()) {
case 1:
return payMoneyUtil.weixinpay
("购买会员", "",
- id + "_" + tVipOrder.getId() + "_" +
+ dto.getId() + "_" + tVipOrder.getId() + "_" +
UUIDUtil.getRandomCode(8),
tVipOrder.getMoney().toString(),
- "/base/wxPayBuyVip", "APP", "");
+ "/base/user/wxPayBuyVip", "APP", "");
case 2:
return payMoneyUtil.alipay
("购买会员",
"购买会员下单支付",
"",
- id + "_" + tVipOrder.getId() + "_" +
+ dto.getId() + "_" + tVipOrder.getId() + "_" +
UUIDUtil.getRandomCode(8),
tVipOrder.getMoney().toString(),
- "/base/aliPayBuyVip");
+ "/base/user/aliPayBuyVip");
}
return AjaxResult.success();
}
+
@PostMapping("/order")
@ApiOperation(value = "购买会员下单操作", tags = {"家长端-个人中心"})
@ApiImplicitParams({
@@ -189,7 +188,7 @@
}
@ResponseBody
- @PostMapping("/base/aliPayBuyVip")
+ @PostMapping("/aliPayBuyVip")
public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
@@ -270,7 +269,7 @@
}
@ResponseBody
- @PostMapping("/base/wxPayBuyVip")
+ @PostMapping("/wxPayBuyVip")
public void wxPayBuyPackage(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
@@ -361,24 +360,26 @@
}
return R.ok();
}
+
@PostMapping("/getUserInfoParent")
@ApiOperation(value = "获取用户信息", tags = {"家长端-获取用户信息"})
public R<TUser> getUserInfo() {
LoginUserParent loginUser1 = tokenService.getLoginUser1();
- if (loginUser1!=null){
+ if (loginUser1 != null) {
TUser byId = userService.getById(loginUser1.getUserid());
- if (byId.getVipEndTime() == null){
+ if (byId.getVipEndTime() == null) {
byId.setIsVip(0);
- }else if (byId.getVipEndTime().after(new Date())){
+ } else if (byId.getVipEndTime().after(new Date())) {
byId.setIsVip(1);
- }else{
+ } else {
byId.setIsVip(0);
}
return R.ok(byId);
- }else{
+ } else {
return R.tokenError("登录失效");
}
}
+
@PostMapping("/parentPage")
@ApiOperation(value = "平板", tags = {"启动页"})
public R<String> parentPage() {
@@ -417,7 +418,25 @@
@ApiOperation(value = "使用指南", tags = {"家长端-使用指南"})
public R<PageInfo<TUseGuide>> useGuide(@RequestBody UseGuideQuery query) {
PageInfo<TUseGuide> data = managementClient.useGuide1(query).getData();
+ for (TUseGuide record : data.getRecords()) {
+ String plainTextContent = record.getAnswer().replaceAll("\\<.*?\\>", "");
+ record.setCount(plainTextContent);
+ }
return R.ok(data);
+ }
+ @PostMapping("/useGuideGetInfo")
+ @ApiOperation(value = "查看详情", tags = {"家长端-使用指南"})
+ public R useGuideGetInfo(Integer id) {
+ UseGuideQuery useGuideQuery = new UseGuideQuery();
+ useGuideQuery.setPageNumber(1);
+ useGuideQuery.setPageSize(300);
+ PageInfo<TUseGuide> data = managementClient.useGuide1(useGuideQuery).getData();
+ for (TUseGuide record : data.getRecords()) {
+ if (record.getId() == id){
+ return R.ok(record.getAnswer());
+ }
+ }
+ return R.ok();
}
@PostMapping("/feedBack")
@@ -444,26 +463,26 @@
.eq("phone", phone));
if (tUser1 != null) {
if (tUser1.getState() == 2) {
- throw new GlobalException("登录失败，您的账号已被冻结!");
+ return R.freeze("登录失败，您的账号已被冻结!");
}
} else {
// 手机验证码校验
- if (!phoneCode.equals("123456")){
- Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
+ if (!phoneCode.equals("123456")) {
+ Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
if (null == redisPhoneCode) {
- throw new GlobalException("登录失败，手机验证码已过期!");
+ return R.errorCode("登录失败，手机验证码无效!");
} else {
// redis 验证码的value 为 code:时间戳
String rCodeAndTime = String.valueOf(redisPhoneCode);
String rCode = rCodeAndTime.split(":")[0];
if (!rCode.equalsIgnoreCase(phoneCode)) {
- throw new GlobalException("登录失败，手机验证码输入有误!");
+ return R.errorCode("登录失败，手机验证码无效!");
} else {
tUser1 = getUser(phone);
userService.save(tUser1);
}
}
- }else{
+ } else {
tUser1 = getUser(phone);
userService.save(tUser1);
}
@@ -513,7 +532,7 @@
userService.save(user);
}
}
- }else{
+ } else {
user = getUser(phone);
userService.save(user);
}
@@ -532,6 +551,7 @@
/**
* 学生端退出登录
+ *
* @param request 请求信息
*/
@PostMapping("/logoutStudy")
@@ -574,7 +594,7 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "手机号", name = "phone", dataType = "string", required = true),
})
- public R<?> sendPhoneCode(@RequestParam String phone) {
+ public R<?> sendPhoneCode(@RequestParam String phone) throws Exception {
return userService.phoneCode(phone) ? R.ok() : R.fail();
}
@@ -586,7 +606,7 @@
public R<TSysSet> shareInfo() {
// 分享信息
TSysSet data = managementClient.shareInfo().getData();
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
Integer userid = tokenService.getLoginUserStudy().getUserid();
@@ -615,7 +635,7 @@
public R<TSysSet> shareInfoParent() {
// 分享信息
TSysSet data = managementClient.shareInfo().getData();
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
Integer userid = tokenService.getLoginUser1().getUserid();
@@ -635,6 +655,7 @@
}
return R.ok(data);
}
+
/**
* 获取用户信息
*
@@ -642,9 +663,10 @@
*/
@GetMapping("/userInfo")
@ApiOperation(value = "用户详情", tags = {"学习端-用户详情"})
- public R<TUser> userInfo() {
-
- return R.ok(userService.lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid()).one());
+ public R<UserPersonalCenterVO> userInfo() {
+ TUser user = userService.lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid()).one();
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, user.getId()).eq(TUserStudy::getDisabled, 0).one();
+ return R.ok(new UserPersonalCenterVO(user, userStudy));
}
@PostMapping("/deleteUser")
@@ -670,7 +692,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer eyJhbGciOiJIUzUxMiJ....", required = true, paramType = "header"),
})
public R<String> logout(HttpServletRequest request) {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
String token = SecurityUtils.getToken(request);
@@ -691,8 +713,8 @@
@ApiImplicitParam(name = "headImg", value = "头像 改什么就只传什么"),
@ApiImplicitParam(name = "phoneCode", value = "手机验证码，修改手机号的时候传"),
})
- public R<String> updateUserInfo(String name, String phone, String headImg,String phoneCode) {
- if (tokenService.getLoginUser1() == null){
+ public R<String> updateUserInfo(String name, String phone, String headImg, String phoneCode) {
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
Integer userid = tokenService.getLoginUser1().getUserid();
@@ -714,7 +736,7 @@
byId.setPhone(phone);
}
// 手机验证码校验
- if (!phoneCode.equals("123456")){
+ if (!phoneCode.equals("123456")) {
Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
if (null == redisPhoneCode) {
return R.errorCode("手机验证码无效");
--
Gitblit v1.7.1