From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 16 +
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 26 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java | 3
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html | 333 +++++++++++++++++++++-----------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 37 +++
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 7
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java | 4
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 4
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 18 +
cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java | 4
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js | 103 ++++-----
13 files changed, 362 insertions(+), 199 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java
index 3b35d5b..db68777 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java
@@ -23,6 +23,7 @@
*/
private Integer storeId;
+ private Integer type;
/**
* 门店名称
*/
@@ -67,6 +68,8 @@
*/
@TableField("cityCode")
private String cityCode;
+ @TableField("operatorId")
+ private Integer operatorId;
/**
* 预约开始时间
*/
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index e9a69b7..edf5cef 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -34,7 +34,12 @@
* @param provinceCode
* @return
*/
- List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode);
+ List<Map<String, Object>> queryCity2(@Param("provinceCode") String provinceCode,
+ @Param("cityCode") String cityCode,
+ @Param("type") Integer type,
+ @Param("operatorId") Integer operatorId);
List<Map<String, Object>> queryCity1();
List<Map<String, Object>> queryListOfpage(@Param("provinceCode") String provinceCode,
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index 3d9f9a1..0347a98 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -749,7 +749,7 @@
// CityManager cityManager = cityManagerClient.queryCityManagerById(objectId);
// cityCode = cityManager.getCityCode();
// }
- System.out.println("======="+storeService.queryCity(code, cityCode));
+
// return storeService.queryCity(code, cityCode);
return new ResultUtil(0,null,null,storeService.queryCity(code, cityCode),null);
}
@@ -771,6 +771,14 @@
return new ResultUtil(0,null,null,null,null);
}
+
+ @ResponseBody
+ @PostMapping("/queryStore1//{id}")
+ public ResultUtil queryCity6(){
+
+ return new ResultUtil(0,null,null,null,null);
+ }
+
/**
* 根据城市code获取门店
* @param cityCode
@@ -786,9 +794,30 @@
@ResponseBody
- @PostMapping("/queryStore1/{cityCode}")
- public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode){
- List<TStore> list = storeService.list(new QueryWrapper<TStore>().select("id","name").eq("cityCode", cityCode).eq("state", 1));
+ @PostMapping("/queryStore1/{cityCode}/{$operationId}")
+ public ResultUtil queryStore1(@PathVariable("cityCode") String cityCode,
+ @PathVariable("$operationId") String operationId){
+ Integer operatorId= 0;
+ Integer type= 0;
+ if (operationId.equals("平台")){
+ type = 1;
+ operatorId = null;
+ }else{
+ operatorId = Integer.valueOf(operationId);
+ type = 2;
+ }
+ QueryWrapper<TStore> wrapper = new QueryWrapper<>();
+ wrapper.select("id","name");
+ wrapper.eq("cityCode", cityCode);
+ wrapper.eq("state", 1);
+ wrapper.eq("type", type);
+ if (type!=1){
+ // 如果不是勾选的平台 是选择的运营商 那么筛选运营商id
+ wrapper.eq("operatorId",operatorId);
+ }
+ List<TStore> list = storeService.list(
+ wrapper
+ );
// Map<String,Integer> map = new LinkedHashMap<>();
List<SelectDto> selectDtos = new ArrayList<>();
Map<String,Integer> map = new HashMap<>();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java
index 2d20e65..4d34803 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java
@@ -130,8 +130,6 @@
.ne("state",3));
model.addAttribute("siteList",siteList);
}
-
-
return PREFIX + "gate_add.html";
}
@@ -310,10 +308,8 @@
List<Map<String,Object>> res = gateService.listAll(name,device,operatorName,storeName,storeIds,page);
return res;
}
-
/**
* 根据运营商id获取门店列表
-
*/
@RequestMapping(value = "/getStore")
@ResponseBody
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 53fc4ec..212c273 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -598,7 +598,21 @@
vo.setObjectType(type);
vo.setObjectId(objectId);
vo.setOpId(opId);
- return siteClient.listExipre(vo);
+ List<TSiteDTO> tSiteDTOS = siteClient.listExipre(vo);
+ for (TSiteDTO tSiteDTO : tSiteDTOS) {
+ Integer storeId = tSiteDTO.getStoreId();
+ TStore byId = storeService.getById(storeId);
+ if (byId!=null){
+ if (byId.getType()==1){
+ tSiteDTO.setOperator("平台");
+ }else{
+ TOperator byId1 = tOperatorService.getById(tSiteDTO.getOperatorId());
+ if (byId1!=null)
+ tSiteDTO.setOperator(byId1.getName());
+ }
+ }
+ }
+ return tSiteDTOS;
}
@Autowired
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
index ed97bff..1840526 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
@@ -39,6 +39,8 @@
*/
List<Map<String, Object>> queryCity(String provinceCode, String cityCode);
List<Map<String, Object>> queryCity1();
+ List<Map<String, Object>> queryCity2(String provinceCode, String cityCode,
+ Integer type,Integer operatorId);
List<Map<String, Object>> queryListOfpage(String provinceCode, String cityCode, Integer operatorId, String storeName, Page<Map<String, Object>> page);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
index 69cdb47..2dc8277 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -50,6 +50,10 @@
* @return
*/
@Override
+ public List<Map<String, Object>> queryCity2(String provinceCode, String cityCode,Integer type,Integer operatorId) {
+ return this.baseMapper.queryCity2(provinceCode, cityCode,type,operatorId);
+ }
+ @Override
public List<Map<String, Object>> queryCity(String provinceCode, String cityCode) {
return this.baseMapper.queryCity(provinceCode, cityCode);
}
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 6cffee2..86ea7ec 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -79,6 +79,24 @@
group by cityCode
) as aa order by aa.code
</select>
+ <select id="queryCity2" resultType="map">
+
+ select * from (
+ select cityCode as code, city as name
+ from t_store where state = 1 and provinceCode = #{provinceCode}
+ <if test="null != cityCode and '' != cityCode">
+ and cityCode = #{cityCode}
+ </if>
+ <if test="null != type">
+ and `type` = #{type}
+ </if>
+ <if test="null != operatorId">
+ and operatorId = #{operatorId}
+ </if>
+ group by cityCode
+ ) as aa order by aa.code
+ </select>
+
<select id="queryCity1" resultType="map">
select * from (
select cityCode as code, city as name from t_store where state = 1
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index 1f4080d..fd33deb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -37,7 +37,6 @@
// 通过替换下面这个配置来生成不同页面
let amisJSON = {
"type": "page",
- "id": "u:8c028a595aa6",
"body": [
{
"type": "form",
@@ -50,13 +49,21 @@
"tpl": "                 *所属运营商：",
"inline": true,
"wrapperComponent": "",
-
"style": {
- "marginLeft": "0",
- "fontFamily": "",
- "fontSize": 18
+ "fontFamily": ""
+ },
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ },
+ "font:default": {
+ "fontSize": 18
+ }
+ }
}
- },{
+ },
+ {
"type": "select",
"label": "",
"name": "operationId",
@@ -75,12 +82,12 @@
"source": {
"url": "/ball/yunying",
"method": "post",
- "messages": {
- }
+ "messages": {}
},
"labelField": "value",
"valueField": "id"
- },{
+ },
+ {
"type": "checkbox",
"option": "平台",
"name": "is",
@@ -102,7 +109,6 @@
"trueValue": "平台",
"falseValue": 0,
"mode": "inline"
-
},
{
"type": "select",
@@ -112,20 +118,18 @@
"multiple": false,
"mode": "horizontal",
"size": "md",
- "value":"",
+ "value": "",
"horizontal": {
"leftFixed": "lg"
},
"source": {
"url": "/coursePackage/queryProvince",
"method": "get",
- "messages": {
- },
+ "messages": {},
"sendOn": "",
"requestAdaptor": "",
"adaptor": "",
"silent": true
-
},
"onEvent": {
"change": {
@@ -158,8 +162,7 @@
"source": {
"url": "/coursePackage/queryCity1/$province",
"method": "post",
- "messages": {
- },
+ "messages": {},
"sendOn": "this.province != null &&this.province != ' '",
"requestAdaptor": "",
"adaptor": "",
@@ -197,9 +200,8 @@
},
"source": {
"method": "post",
- "url": "/coursePackage/queryStore1/$city",
- "messages": {
- },
+ "url": "/coursePackage/queryStore1/$city/$operationId",
+ "messages": {},
"sendOn": "this.city != null &&this.city != ' '",
"requestAdaptor": "",
"adaptor": "",
@@ -225,7 +227,7 @@
"type": "select",
"label": "所属场地：",
"name": "site",
- "value":"",
+ "value": "",
"id": "u:0d288f4bdd8e",
"multiple": false,
"mode": "horizontal",
@@ -236,8 +238,7 @@
"source": {
"url": "/coursePackage/querySite/$store",
"method": "post",
- "messages": {
- },
+ "messages": {},
"dataType": "form",
"requestAdaptor": "",
"adaptor": "",
@@ -255,9 +256,17 @@
"wrapperComponent": "",
"id": "u:587781d5d181",
"style": {
- "marginLeft": "0",
- "fontFamily": "",
- "fontSize": 18
+ "fontFamily": ""
+ },
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ },
+ "font:default": {
+ "fontSize": 18
+ }
+ }
}
},
{
@@ -272,8 +281,6 @@
},
"value": "",
"required": true
- ,
- "value":""
},
{
"type": "input-text",
@@ -283,9 +290,8 @@
"mode": "inline",
"clearValueOnHidden": false,
"hidden": false,
- "required": true
- ,
- "value":""
+ "required": true,
+ "value": ""
},
{
"type": "button",
@@ -345,14 +351,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -379,8 +391,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -408,8 +425,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:8445330f451b",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -446,14 +462,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -480,8 +502,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -509,8 +536,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:8445330f451b",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -546,14 +572,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -580,8 +612,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -609,8 +646,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:8445330f451b",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -652,14 +688,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -677,8 +719,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -715,8 +762,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:89bd6bd7e231",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -753,14 +799,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -787,8 +839,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -816,8 +873,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:8445330f451b",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -853,14 +909,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -887,8 +949,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -916,8 +983,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:8445330f451b",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -959,14 +1025,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -993,8 +1065,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -1022,8 +1099,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:20efa0a87285",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -1060,14 +1136,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -1094,8 +1176,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -1123,8 +1210,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:4b37f6a2c067",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -1160,14 +1246,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -1194,8 +1286,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -1223,8 +1320,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:cd832349886c",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -1266,14 +1362,20 @@
"multiple": false,
"hideUploadButton": false,
"fixedSize": false
- },{
+ },
+ {
"type": "tpl",
"id": "u:587781d5d181",
"tpl": "          推荐像素：780px x 424px",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -1300,8 +1402,13 @@
"tpl": "                                ",
"inline": true,
"wrapperComponent": "",
- "style": {
- "marginLeft": "0"
+ "style": {},
+ "themeCss": {
+ "baseControlClassName": {
+ "padding-and-margin:default": {
+ "marginLeft": "0"
+ }
+ }
}
},
{
@@ -1329,8 +1436,7 @@
"labelClassName": "text-dark m-b text-lg"
}
],
- "actions": [
- ],
+ "actions": [],
"id": "u:fe79896823ad",
"bodyClassName": "no-border b-light",
"className": "no-border"
@@ -1340,13 +1446,11 @@
"columnClassName": "p-l-lg"
},
{
- "body": [
- ],
+ "body": [],
"id": "u:5a16b34e0128"
},
{
- "body": [
- ],
+ "body": [],
"id": "u:a49cf291b3fe"
}
],
@@ -1370,8 +1474,7 @@
"click": {
"actions": [
{
- "args": {
- },
+ "args": {},
"script": "parent.layer.close(window.parent.TStudent.layerIndex);",
"actionType": "custom"
}
@@ -1392,8 +1495,7 @@
"actionType": "submit"
},
{
- "args": {
- },
+ "args": {},
"script": "window.parent.TStudent.table.refresh();",
"actionType": "custom"
}
@@ -1416,27 +1518,26 @@
"api": {
"url": "/ball/save",
"method": "post",
- "messages": {
- },
+ "messages": {},
"dataType": "form-data"
},
- "actions": [
- ],
+ "actions": [],
"onEvent": {
"submitSucc": {
"weight": 0,
"actions": [
{
- "args": {
- },
+ "args": {},
"script": "parent.layer.close(window.parent.TStudent.layerIndex);",
"actionType": "custom"
}
]
}
- }
+ },
+ "feat": "Insert"
}
- ]
+ ],
+ "id": "u:8c028a595aa6"
};
let amisScoped = amis.embed('#root', amisJSON);
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 5778de5..369335e 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
@@ -179,6 +179,7 @@
subArr.push($(this).find("input[name*='id']").val());
});
var str = '';
+ this.siteIds = [];
for(var i in arr){
var b = true;
for(var j in subArr){
@@ -188,6 +189,9 @@
}
}
if(b){
+ console.log("push前")
+ console.log(this.siteIds)
+
this.siteIds.push(arr[i].id);
console.log("场地push")
console.log(arr[i].id)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index 864806e..d3ede42 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -24,13 +24,7 @@
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{
title: '所属运营商', field: 'operator', visible: objectType==3?false:true, align: 'center', valign: 'middle',
- formatter: function(value, row, index) {
- if (!value || value.trim() === '' || value.trim() === 0) {
- return '平台';
- } else {
- return value;
- }
- }
+
},
{
title: '省', field: 'province', visible: objectType === 1 ? true : false, align: 'center', valign: 'middle', width: '20%',
@@ -178,9 +172,9 @@
oneId=0;
console.log("选中是平台");
} else {
+ oneId = 1;
console.log("运营商");
console.log(oneId)
-
}
var ajax = new $ax(Feng.ctxPath + "/tSite/getChangeOne", function(data){
if(data!=null){
@@ -205,12 +199,11 @@
}
});
- if (typeof(oneId) == "undefined"){
+ if (oneId == "1"){
console.log("===============")
oneId = $("#yys").val()
var button = document.getElementById("yys");
button.removeAttribute("disabled");
-
}
ajax.set("oneId",oneId);
@@ -447,6 +440,7 @@
imgs:"",
reservation:"",
isCanBeBooked:"",
+ type:"",
};
data.province = $("#pCode").val()
@@ -476,6 +470,15 @@
data.isCanBeBooked= reservation;
console.log("看看是否可预约值")
console.log(reservation);
+ var checkbox = document.querySelector('input[name="pt"]');
+ if (checkbox.checked) {
+ data.type = 1
+ console.log("选中是平台");
+ data.operatorId = 0;
+ } else {
+ console.log("运营商");
+ data.type = 2;
+ }
if (reservation == 1) {
if (data.typeName === "智慧场地") {
console.log("===========这是智慧球场")
@@ -548,9 +551,6 @@
SelectValue= yys
}
data.operatorId= SelectValue;
-
-
-
let num24 = $('input[name="name1"]');
var nextName="";
for (let i = 0; i < num24.length; i++) {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
index 34ad6ba..860aeac 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite_info.js
@@ -205,6 +205,7 @@
introduce:"",
imgs:"",
reservation:"",
+ isCanBeBooked:"",
};
data.province = $("#pCode").val()
data.id = $("#id").val()
@@ -225,64 +226,51 @@
var sm =data.appointmentStartTime.split(':')[1];
var eh =data.appointmentEndTime.split(':')[0];
var em =data.appointmentEndTime.split(':')[1];
-
- if (data.typeName === "智慧场地"){
- console.log("===========这是智慧球场")
-
- console.log("====="+data.appointmentStartTime)
-
- var value = data.appointmentStartTime;
- var lastTwoDigits = value.slice(-2);
-
- if (lastTwoDigits === "00" || lastTwoDigits === "15" || lastTwoDigits === "30" || lastTwoDigits === "45") {
- console.log("Last two digits are 00, 15, 30, or 45");
+ var reservation= $("input[name='reservation']:checked").val();
+ data.reservation= reservation;
+ data.isCanBeBooked= reservation;
+ if (reservation==1) {
+ if (data.typeName === "智慧场地") {
+ console.log("===========这是智慧球场")
+ console.log("=====" + data.appointmentStartTime)
+ var value = data.appointmentStartTime;
+ var lastTwoDigits = value.slice(-2);
+ if (lastTwoDigits === "00" || lastTwoDigits === "15" || lastTwoDigits === "30" || lastTwoDigits === "45") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.error("智慧场地的可预约时间段是15分钟的倍数")
+ return;
+ }
+ var value1 = data.appointmentEndTime;
+ var lastTwoDigits1 = value1.slice(-2);
+ if (lastTwoDigits1 === "00" || lastTwoDigits1 === "15" || lastTwoDigits1 === "30" || lastTwoDigits1 === "45") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.error("智慧场地的可预约时间段是15分钟的倍数")
+ return;
+ }
} else {
- Feng.error("智慧场地的可预约时间段是15分钟的倍数")
- return;
+ console.log("===========这是普通球场")
+ console.log("=====" + data.appointmentStartTime)
+ var value = data.appointmentStartTime;
+ var lastTwoDigits = value.slice(-2);
+ if (lastTwoDigits === "00" || lastTwoDigits === "30") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.info("普通场地可预约时间段需是30分钟的倍数")
+ return;
+ }
+ var value1 = data.appointmentEndTime;
+ var lastTwoDigits1 = value1.slice(-2);
+ if (lastTwoDigits1 === "00" || lastTwoDigits1 === "30") {
+ console.log("Last two digits are 00, 15, 30, or 45");
+ } else {
+ Feng.info("普通场地可预约时间段需是30分钟的倍数")
+ return;
+
+ }
}
-
-
- var value1 = data.appointmentEndTime;
- var lastTwoDigits1 = value1.slice(-2);
-
- if (lastTwoDigits1 === "00" || lastTwoDigits1 === "15" || lastTwoDigits1 === "30" || lastTwoDigits1 === "45") {
- console.log("Last two digits are 00, 15, 30, or 45");
- } else {
- Feng.error("智慧场地的可预约时间段是15分钟的倍数")
- return;
-
- }
-
-
- }else {
- console.log("===========这是普通球场")
-
- console.log("====="+data.appointmentStartTime)
- var value = data.appointmentStartTime;
- var lastTwoDigits = value.slice(-2);
-
- if (lastTwoDigits === "00" || lastTwoDigits === "30" ) {
- console.log("Last two digits are 00, 15, 30, or 45");
- } else {
- Feng.info("普通场地可预约时间段需是30分钟的倍数")
- return;
- }
-
-
- var value1 = data.appointmentEndTime;
- var lastTwoDigits1 = value1.slice(-2);
-
- if (lastTwoDigits1 === "00"|| lastTwoDigits1 === "30" ) {
- console.log("Last two digits are 00, 15, 30, or 45");
- } else {
- Feng.info("普通场地可预约时间段需是30分钟的倍数")
- return;
-
- }
-
-
-
}
@@ -322,12 +310,9 @@
var ishalf= $("input[name='ishalf']:checked").val();
data.ishalf= ishalf;
- var reservation= $("input[name='reservation']:checked").val();
- data.reservation= reservation;
+
var halfName="";
if (reservation==1){
-
-
if(ishalf==1){
let cashPriceOne = $("#cashPriceOne").val()
if(cashPriceOne=='' ){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java b/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java
index e1e95e8..5a4befc 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java
@@ -39,9 +39,11 @@
*/
private String siteTypeName;
/**
- * 城市管理员id
+ * 城市管理员id 弃用了
*/
private Integer cityManagerId;
+ // 运营商id
+ private Integer operatorId;
/**
* 省
*/
--
Gitblit v1.7.1