From e6f7a4ab39f0bc1e5c0545170a90323ee9920d32 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 12:07:23 +0800
Subject: [PATCH] bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 8 ++------
cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml | 4 ++--
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 2 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java | 6 ++++++
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
index 66adb5f..1fa4c2a 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
@@ -45,9 +45,9 @@
<if test="query.coursePackageTypeName!=null and query.coursePackageTypeName!= ''">
and t2.name like concat('%',#{query.coursePackageTypeName},'%')
</if>
- <if test="query.storesIds != null and query.storesIds.size()>0">
+ <if test="query.storeIds != null and query.storeIds.size>0">
AND t2.storeId IN
- <foreach collection="query.storesIds" separator="," item="id" open="(" close=")">
+ <foreach collection="query.storeIds" separator="," item="id" open="(" close=")">
#{id}
</foreach>
</if>
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
index e62a599..48dd171 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TFinanceController.java
@@ -148,6 +148,9 @@
query.setProvince(province);
query.setCity(city);
query.setStoreId(storeId);
+ if(UserExt.getUser().getObjectType()==3){
+ query.setStoreId(UserExt.getUser().getObjectId());
+ }
query.setRegisterTime(registerTime);
query.setUserName(userName);
query.setUserIds(Lists.newArrayList());
@@ -620,6 +623,9 @@
query.setProvince(province);
query.setCity(city);
query.setStoreId(storeId);
+ if(UserExt.getUser().getObjectType()==3){
+ query.setStoreId(UserExt.getUser().getObjectId());
+ }
query.setRegisterTime(registerTime);
query.setUserName(userName);
query.setUserIds(Lists.newArrayList());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index d0c6694..47237ed 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -402,18 +402,14 @@
user.setPassword(SecureUtil.md5("a123456"));
user.setObjectType(3);
user.setStatus(1);
- user.setObjectId(tStore.getId());
- userMapper.insert(user);
tStore.setStoreStaffId(user.getId());
tStore.setLon(lon);
tStore.setLat(lat);
tStore.setOperatorId(UserExt.getUser().getObjectId());
storeService.save(tStore);
-
-
-
-
+ user.setObjectId(tStore.getId());
+ userMapper.insert(user);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 15fa840..8fa163b 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -153,7 +153,7 @@
</select>
<select id="listAllStore" resultType="com.dsh.guns.modular.system.model.TStoreListVo">
select t1.*,t2.name userName,t2.phone userPhone,t3.name yysName from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id left join t_operator t3 on t1.operatorId = t3.id
- where t1.id =#{operatorId}
+ where t1.id =#{id}
<if test="provinceCode !=null and provinceCode !=''">
and t1.provinceCode = #{provinceCode}
</if>
--
Gitblit v1.7.1