From 88b7023e5de8ea4d0095368c6b1424b76f35f1a8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 08:47:59 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 2 +-
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java | 2 ++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 4 ++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java | 5 +++++
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TUserMapper.xml | 8 ++++++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TUserMapper.java | 2 ++
6 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 01dfeac..05a6bca 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -1818,7 +1818,7 @@
return R.tokenError("登录失效");
}
IPage<TIntegralRecord> page = integralRecordService.integralDetail(new Page<>(pageNum, pageSize),
- tokenService.getLoginUserStudy().getUserid(), time);
+ tokenService.getLoginUser1().getUserid(), time);
for (TIntegralRecord record : page.getRecords()) {
if (!record.getIntegral().startsWith("-")) {
record.setIntegral("+" + record.getIntegral());
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 e857fd7..dc616ff 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
@@ -193,6 +193,9 @@
String s1 = out_trade_no.split("_")[1];
Integer integer1 = Integer.valueOf(s1);
TVipOrder byId = vipOrderService.getById(integer1);
+ if (byId.getBackTime()!=null){
+ return;
+ }
byId.setPayState(2);
byId.setTransactionId(trade_no);
byId.setOutTradeNo(out_trade_no);
@@ -965,6 +968,7 @@
byId1.setVipEndTime(null);
byId1.setVipPayTime(null);
userService.updateById(byId1);
+ userService.updateOne(byId1.getId(),null,null);
} else {
System.err.println("最近的一次充值会员时间 将会员到期时间回退到上一次");
// 最近的一次充值会员时间
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TUserMapper.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TUserMapper.java
index fac948a..c409791 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TUserMapper.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TUserMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.study.vo.AppUserVO;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
/**
@@ -20,4 +21,5 @@
List<AppUserVO> listAll(@Param("req") AppUserQuery query);
+ void updateOne(@Param("id") Integer id,@Param("vipEndTime") Date vipEndTime,@Param("vipPayTime") Date vipPayTime);
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java
index cff1847..932ea21 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java
@@ -6,6 +6,7 @@
import com.ruoyi.study.dto.AppUserQuery;
import com.ruoyi.study.vo.AppUserVO;
+import java.util.Date;
import java.util.List;
/**
@@ -35,4 +36,5 @@
*/
Boolean isVip();
+ void updateOne(Integer id, Date vipEndTime,Date vipPayTime);
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
index d27f0d8..11118d4 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java
@@ -101,4 +101,9 @@
return null != vipEndTime && System.currentTimeMillis() <= vipEndTime.getTime();
}
+ @Override
+ public void updateOne(Integer id, Date vipEndTime,Date vipPayTime) {
+ this.baseMapper.updateOne(id,vipPayTime,vipPayTime);
+ }
+
}
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TUserMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TUserMapper.xml
index 9b11713..925a44e 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TUserMapper.xml
+++ b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TUserMapper.xml
@@ -24,6 +24,14 @@
<sql id="Base_Column_List">
id, name, account, phone, password, openId, birthday, gender, headImg, integral, state, insertTime, vipEndTime, vipPayTime, isBack, backTime
</sql>
+ <update id="updateOne">
+ update t_user
+ <set>
+ vipEndTime = #{vipEndTime},
+ vipPayTime = #{vipPayTime},
+ </set>
+ and id = #{id}
+ </update>
<select id="listAll" resultType="com.ruoyi.study.vo.AppUserVO">
select *
from t_user
--
Gitblit v1.7.1