无关风月
2024-07-04 88b7023e5de8ea4d0095368c6b1424b76f35f1a8
bug修改
6个文件已修改
23 ■■■■■ 已修改文件
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TUserMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TUserMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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());
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("最近的一次充值会员时间  将会员到期时间回退到上一次");
                    // 最近的一次充值会员时间
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);
}
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);
}
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);
    }
}
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