From 9d6848ea3b085d66f515403d1991ed492d4bc395 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 09:04:48 +0800
Subject: [PATCH] bug修改
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 2 +-
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 4 ++--
cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml | 2 +-
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 2 +-
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java | 6 ++++--
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 2 +-
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index e51e3ed..4167f8d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -738,8 +738,8 @@
* @param cityCode 城市code
* @return
*/
- @PostMapping("/appUser/getAppUserIds")
- public List<Integer> getAppUserIds(@RequestBody String cityCode){
+ @GetMapping("/appUser/getAppUserIds/{cityCode}")
+ public List<Integer> getAppUserIds(@PathVariable("cityCode") String cityCode){
List<TAppUser> list = appUserService.list(new QueryWrapper<TAppUser>().eq("cityCode", cityCode).eq("state", 1));
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
diff --git a/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml b/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
index 58e0ce9..1ff9f84 100644
--- a/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml
@@ -120,7 +120,7 @@
tph.id,
thc.huiMinName,
thc.huiMinType,
- thc.salesMoney,
+ tph.salesMoney,
thc.operatorId,
thc.storeIds,
tph.appUserId,
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
index 77570a4..71449e7 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -1260,7 +1260,7 @@
Date birthday = appUser.getBirthday();
LocalDate now = LocalDate.now();
if(birthday!=null){
- int age = now.getYear() - birthday.getYear();
+ int age = now.getYear() - (birthday.getYear()+1900);
worldCupUserListVo.setAge(age);
}
worldCupUserListVos.add(worldCupUserListVo);
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java
index 3962449..233ba61 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java
@@ -5,6 +5,8 @@
import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
import com.dsh.communityWorldCup.model.UserDetailsOfSearch;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List;
@@ -47,8 +49,8 @@
* @param cityCode 城市code
* @return
*/
- @PostMapping("/appUser/getAppUserIds")
- List<Integer> getAppUserIds(String cityCode);
+ @GetMapping("/appUser/getAppUserIds/{cityCode}")
+ List<Integer> getAppUserIds(@PathVariable("cityCode")String cityCode);
/**
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 637f694..b3e7dbb 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -218,7 +218,7 @@
,t2.type as `type`
from t_site t1
left join t_store t2 on t1.storeId =t2.id
- where t1.state=1 and t2.state=1 and t1.isCanBeBooked = 0 and t1.reservation=0
+ where t1.state=1 and t2.state=1
<if test="provinceCode != null and provinceCode!=''">
and t1.provinceCode = #{provinceCode}
</if>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index cd6ef91..c9fd3c0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -216,7 +216,7 @@
if (file && file.response) {
file.url = file.response;
}
- TCarInfoDlg.goodsPicArray.push(res);
+ TCarInfoDlg.goodsPicArray.push(file.url);
console.log(TCarInfoDlg.goodsPicArray);
},
// 添加 beforeUpload 钩子到 el-upload 组件
--
Gitblit v1.7.1