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 | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 cce1686..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
@@ -88,8 +88,12 @@
// 类型匹配 todo
if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
- for (String s : goodQuery.getType()) {
- wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ 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{
+ wrapper.or().apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+// }
}
}
wrapper.eq("isDelete", 0);
@@ -112,8 +116,12 @@
wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
- for (String s : goodQuery.getType()) {
- wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ 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{
+ wrapper.or().apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ }
}
}
wrapper.eq("isDelete", 0);
@@ -596,7 +604,7 @@
}
order.setConsigneeName(recipient.getAddress());
order.setConsigneePhone(recipient.getRecipientPhone());
- order.setConsigneeAddress(recipient.getAddress());
+ order.setConsigneeAddress(recipient.getProvince()+recipient.getCity()+recipient.getAddress());
orderService.updateById(order);
return R.ok();
}
@@ -622,7 +630,7 @@
}
order.setConsigneeName(recipient.getAddress());
order.setConsigneePhone(recipient.getRecipientPhone());
- order.setConsigneeAddress(recipient.getAddress());
+ order.setConsigneeAddress(recipient.getProvince()+recipient.getCity()+recipient.getAddress());
orderService.updateById(order);
return R.ok();
}
--
Gitblit v1.7.1