From 883d04c8d038ba0e45c1630f760f4aa642286f45 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 22 五月 2024 10:50:48 +0800
Subject: [PATCH] feat: 微信分享更改;接口返回更改;接口参数描述
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 76 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 23 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 6cb31db..d55f8cb 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
@@ -12,17 +12,16 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.api.feignClient.ManagementClient;
-import com.ruoyi.management.api.model.TFeedback;
-import com.ruoyi.management.api.model.TPage;
-import com.ruoyi.management.api.model.TUseGuide;
-import com.ruoyi.management.api.model.TVipSet;
+import com.ruoyi.management.api.model.*;
import com.ruoyi.management.api.query.UseGuideQuery;
import com.ruoyi.study.domain.TUser;
+import com.ruoyi.study.domain.TUserShare;
import com.ruoyi.study.domain.TVipOrder;
import com.ruoyi.study.dto.AppUserQuery;
import com.ruoyi.study.dto.UserInfoQuery;
import com.ruoyi.study.request.RegisterPhoneRequest;
import com.ruoyi.study.service.ITUserService;
+import com.ruoyi.study.service.ITUserShareService;
import com.ruoyi.study.service.IVipOrderService;
import com.ruoyi.study.utils.PayMoneyUtil;
import com.ruoyi.study.utils.UUIDUtil;
@@ -65,6 +64,8 @@
private TokenService tokenService;
@Resource
private RedisService redisService;
+ @Resource
+ private ITUserShareService userShareService;
@PostMapping("/vipInfo")
@ApiOperation(value = "会员中心-获取会员说明、当前登录用户是否为会员、会员购买规格", tags = {"家长端-个人中心"})
@@ -301,6 +302,7 @@
}
return AjaxResult.success();
}
+
@PostMapping("/parentPage")
@ApiOperation(value = "平板", tags = {"家长端-启动页"})
public AjaxResult<String> parentPage() {
@@ -312,6 +314,7 @@
}
return AjaxResult.success();
}
+
@PostMapping("/parentPage1")
@ApiOperation(value = "手机", tags = {"家长端-启动页"})
public AjaxResult<String> parentPage1() {
@@ -323,6 +326,7 @@
}
return AjaxResult.success();
}
+
@PostMapping("/getProtocol")
@ApiOperation(value = "获取协议", tags = {"家长端-协议"})
@ApiImplicitParams({
@@ -367,9 +371,21 @@
return AjaxResult.error("登录失败，您的账号已被冻结!");
}
} else {
- // todo 验证码校验
- tUser1 = getUser(phone);
- userService.save(tUser1);
+ // 手机验证码校验
+ Object redisPhoneCode = redisService.getCacheObject(RedisConstants.PHONE_CODE + phone);
+ if (null == redisPhoneCode) {
+ return AjaxResult.error("登录失败，手机验证码已过期!");
+ } else {
+ // redis 验证码的value 为 code:时间戳
+ String rCodeAndTime = String.valueOf(redisPhoneCode);
+ String rCode = rCodeAndTime.split(":")[0];
+ if (!rCode.equalsIgnoreCase(phoneCode)) {
+ return AjaxResult.error("登录失败，手机验证码输入有误!");
+ } else {
+ tUser1 = getUser(phone);
+ userService.save(tUser1);
+ }
+ }
}
LoginUserParent loginUserParent = new LoginUserParent();
loginUserParent.setName(tUser1.getName());
@@ -455,17 +471,29 @@
}
/**
- * 家长端 学习端都可用
- *
- * @param url app网页链接
+ * 分享图片、标题及可获积分数
*/
- @GetMapping("/weiXinShare")
- @ApiOperation(value = "微信分享", tags = {"微信分享"})
- @ApiImplicitParams({
- @ApiImplicitParam(value = "应用分享url地址", name = "url", dataType = "string", required = true),
- })
- public AjaxResult weiXinShare(@RequestParam String url) {
- return AjaxResult.success(userService.weiXinShare(url));
+ @GetMapping("/shareInfo")
+ @ApiOperation(value = "微信分享信息", tags = {"微信分享信息"})
+ public AjaxResult shareInfo() {
+ // 分享信息
+ TSysSet data = managementClient.shareInfo().getData();
+ Integer userid = tokenService.getLoginUserStudy().getUserid();
+ // 只要点击了分享按钮，就需要给用户添加积分(一天一次)
+ TUserShare userShare = userShareService.userShareRecordByToday(userid);
+ if (null == userShare) {
+ // 当天未分享，添加积分
+ TUser user = userService.getById(userid);
+ int integral = Integer.parseInt(data.getIntegralShare());
+ user.setIntegral(user.getIntegral() + integral);
+ userService.updateById(user);
+ // 添加分享记录
+ TUserShare record = new TUserShare();
+ record.setIntegral(integral);
+ record.setUserId(userid);
+ userShareService.save(record);
+ }
+ return AjaxResult.success();
}
@PostMapping("/deleteUser")
@@ -544,6 +572,7 @@
userService.saveOrUpdate(byId);
return AjaxResult.success("修改成功");
}
+
@ResponseBody
@PostMapping("/base/wxRefund")
public void cancelMySiteCallback(HttpServletRequest request, HttpServletResponse response) {
@@ -566,12 +595,12 @@
.eq("payState", 2)
.orderByDesc("createTime"));
int size = list.size();
- if (size == 0){
+ if (size == 0) {
// 证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空
byId1.setVipEndTime(null);
byId1.setVipPayTime(null);
userService.updateById(byId1);
- }else{
+ } else {
// 最近的一次充值会员时间
TVipOrder tVipOrder = list.get(0);
// 将会员到期时间回退到上一次
@@ -588,6 +617,7 @@
e.printStackTrace();
}
}
+
@PostMapping("/vipBack/{id}")
@ApiOperation(value = "会员退款", tags = {"管理后台-会员退款"})
public R vipBack(@PathVariable("id") Integer id) throws AlipayApiException {
@@ -596,7 +626,7 @@
String transactionId = byId.getTransactionId();
// 内部订单号
String outTradeNo = byId.getOutTradeNo();
- switch (byId.getPayType()){
+ switch (byId.getPayType()) {
case 1:
// 微信退款
Map<String, String> stringStringMap = payMoneyUtil.wxRefund(transactionId, outTradeNo, byId.getMoney().toString(), byId.getMoney().toString(), "/base/wxRefund");
@@ -611,7 +641,7 @@
vipOrderService.updateById(byId);
case 2:
// 支付宝退款
- Map<String, String> stringStringMap1 = payMoneyUtil.aliRefund(transactionId,byId.getMoney().toString());
+ Map<String, String> stringStringMap1 = payMoneyUtil.aliRefund(transactionId, byId.getMoney().toString());
if (null == stringStringMap1) {
return R.fail("取消退款异常");
}
@@ -635,12 +665,12 @@
.eq("payState", 2)
.orderByDesc("createTime"));
int size = list.size();
- if (size == 0){
+ if (size == 0) {
// 证明这是用户第一次充值会员 将首次充值会员时间和会员到期时间清空
byId1.setVipEndTime(null);
byId1.setVipPayTime(null);
userService.updateById(byId1);
- }else{
+ } else {
// 最近的一次充值会员时间
TVipOrder tVipOrder = list.get(0);
// 将会员到期时间回退到上一次
--
Gitblit v1.7.1