From 7b5e3e05c53f6da8b69630f7e9ec2019eddc436a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 10:44:53 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java          |    8 ++++----
 ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml                        |    2 +-
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java           |    1 +
 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java |    1 +
 ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/VipOrderMapper.xml                      |    1 +
 ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TUserMapper.xml                         |    4 ++--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index 7f9a4f5..f703b3d 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -89,11 +89,11 @@
         // 类型匹配 todo
         if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
             for (int i = 0; i < goodQuery.getType().size(); i++) {
-                if (i == 0){
-                    wrapper.apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
-                }else{
+//                if (i == 0){
+//                    wrapper.apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+//                }else{
                     wrapper.or().apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
-                }
+//                }
             }
         }
         wrapper.eq("isDelete", 0);
diff --git a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
index 638399c..74125a4 100644
--- a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
+++ b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml
@@ -43,7 +43,7 @@
                 basicCount = #{req.basicCount},
                 userCount = #{req.userCount},
         </set>
-        and id = #{req.id}
+        where id = #{req.id}
     </update>
 
     <select id="goodRecommend" resultType="com.ruoyi.goods.vo.TGoodsVO">
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
index 3674eac..d7a1add 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
@@ -190,6 +190,7 @@
             return AjaxResult.error("新密码不能与旧密码相同");
         }
         one.setPassword(SecurityUtils.encryptPassword(password));
+        sysUserService.updateById(one);
         return AjaxResult.success();
     }
     @GetMapping("/sendPhoneCode")
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 dc616ff..2c85d99 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
@@ -975,6 +975,7 @@
                     TVipOrder tVipOrder = list.get(0);
                     // 将会员到期时间回退到上一次
                     byId1.setVipEndTime(tVipOrder.getTime());
+                    byId1.setVipPayTime(tVipOrder.getPayTime());
                     userService.updateById(byId1);
                 }
                 return R.ok();
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 925a44e..ab0fbb7 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
@@ -28,9 +28,9 @@
         update t_user
         <set>
             vipEndTime = #{vipEndTime},
-            vipPayTime = #{vipPayTime},
+            vipPayTime = #{vipPayTime}
         </set>
-        and id = #{id}
+        where id = #{id}
     </update>
     <select id="listAll" resultType="com.ruoyi.study.vo.AppUserVO">
         select *
diff --git a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/VipOrderMapper.xml b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/VipOrderMapper.xml
index 4b3d22f..b00ba48 100644
--- a/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/VipOrderMapper.xml
+++ b/ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/VipOrderMapper.xml
@@ -13,6 +13,7 @@
         <if test="null != req.phone and '' != req.phone">
             and t2.phone like CONCAT('%', #{req.phone}, '%')
         </if>
+        and t1.payState !=1
         order by t1.payTime desc
     </select>
 </mapper>

--
Gitblit v1.7.1