From 5273de9efb900feb07a9a4f1426976e0580c623f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 02 七月 2024 10:29:37 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 9 ++++-----
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java | 7 -------
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 21 +--------------------
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java | 3 ---
4 files changed, 5 insertions(+), 35 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 4d5d311..98f9320 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
@@ -81,17 +81,16 @@
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- List<String> type = goodQuery.getType();
String keywords = goodQuery.getKeywords();
// 初始化条件构造器
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
- wrapper = keywords != null && "".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
+ wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
StringBuilder temp = new StringBuilder("");
for (String s : goodQuery.getType()) {
- wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
}
}
wrapper.eq("isDelete", 0);
@@ -112,7 +111,7 @@
if (goodQuery.getType() != null && !goodQuery.getType().isEmpty()) {
for (String s : goodQuery.getType()) {
// 将每个类型 ID 应用于 FIND_IN_SET 函数
- wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)");
+ wrapper.apply("FIND_IN_SET('" + s + "', typeIds)");
}
}
wrapper.eq("isDelete", 0);
@@ -773,7 +772,7 @@
// 随便取一条地址数据
List<Recipient> list = recipientService.lambdaQuery()
.eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
- .eq(Recipient::getIsDefault, 1).list();
+ .list();
if (!list.isEmpty()) {
recipient = list.get(0);
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
index 22106c6..fdfcadd 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java
@@ -55,13 +55,6 @@
this.setFieldValByName("createTime", new Date(), metaObject);
this.setFieldValByName("updateTime", new Date(), metaObject);
}
- LoginUserParent loginUser1 = tokenService.getLoginUserStudy();
- if (loginUser1 != null) {
- this.setFieldValByName("createTime", new Date(), metaObject);
- } else {
- this.setFieldValByName("createTime", new Date(), metaObject);
- }
-
}
/**
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 98c4eb4..3fef92b 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
@@ -164,27 +164,8 @@
PayVO payVO = new PayVO();
payVO.setOrderId(tVipOrder.getId());
payVO.setId(id);
-
-
return R.ok(payVO);
-// switch (payType) {
-// case 1:
-// return payMoneyUtil.weixinpay
-// ("购买会员", "",
-// id + "_" + tVipOrder.getId() + "_" +
-// UUIDUtil.getRandomCode(8),
-// tVipOrder.getMoney().toString(),
-// "/base/wxPayBuyVip", "APP", "");
-// case 2:
-// return payMoneyUtil.alipay
-// ("购买会员",
-// "购买会员下单支付",
-// "",
-// id + "_" + tVipOrder.getId() + "_" +
-// UUIDUtil.getRandomCode(8),
-// tVipOrder.getMoney().toString(),
-// "/base/aliPayBuyVip");
-// }
+
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java
index ff3a391..0c8bc64 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java
@@ -66,7 +66,4 @@
@ApiModelProperty(value = "游戏时间")
@TableField(exist = false)
private String time;
-
-
-
}
--
Gitblit v1.7.1