From f9de5e9a3eada85447e73334a30a762069c647f5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 08 三月 2024 17:30:37 +0800
Subject: [PATCH] 1.23 玩湃bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java | 8 +++-----
cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js | 2 ++
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 2 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 2 +-
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 2 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
index 25f28b7..0023ad3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java
@@ -233,16 +233,14 @@
stringObjectMap.put("provinceCity",provinceName+cityName);
Integer managerId = (Integer) stringObjectMap.get("operatorId");
if (managerId == null){
- stringObjectMap.put("accountName","平台");
+ stringObjectMap.put("account","平台");
}else{
if (managerId==0){
- stringObjectMap.put("accountName","平台");
+ stringObjectMap.put("account","平台");
}else{
TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
if (ToolUtil.isNotEmpty(operator)){
- stringObjectMap.put("accountName",operator.getName());
- }else{
- stringObjectMap.put("accountName","平台");
+ stringObjectMap.put("account",operator.getName());
}
}
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index ea1ed96..5800575 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -561,7 +561,7 @@
}
}
}
-
+ // 判断所选场地是否一个运营商
if (StringUtils.hasLength(sites)){
Integer oid=null;
String[] split = sites.split(",");
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index c1f9c59..0fbec6a 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -177,7 +177,7 @@
SELECT t1.id, t1.operatorId, t1.province, t1.city, t2.name,t1.ids,t1.name as siteName
from t_site t1
left join t_store t2 on t1.storeId =t2.id
- where t1.state=1 and t2.state=1
+ where t1.state=1 and t2.state=1 and t1.isCanBeBooked = 1 and t1.reservation=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/tGoods/TSiteListOne.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html
index f622916..dbff552 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>所在门店</h5>
+ <h5>所在场地</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
index f8b2538..79d8665 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js
@@ -17,8 +17,10 @@
{field: 'selectItem', checkbox: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '所在省市', field: 'provinceCity', visible: true, align: 'center', valign: 'middle'},
+ {title: '所属运营商', field: 'account', visible: true, align: 'center', valign: 'middle'},
{title: '门店名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
{title: '场地名称', field: 'siteName', visible: true, align: 'center', valign: 'middle'},
+ {title: '闸机ids', field: 'ids', visible: true, align: 'center', valign: 'middle'},
];
};
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
index e9fd6df..40c0de1 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js
@@ -117,7 +117,7 @@
function siteList1(){
var index = layer.open({
type: 2,
- title: '门店列表',
+ title: '场地列表',
area: ['80%', '80%'], //宽高
fix: false, //不固定
maxmin: true,
--
Gitblit v1.7.1