From 044546d30b3b242f59a9450935245bec40093324 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 15:49:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 2
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupStoreClient.java | 14 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html | 74 ++++++++----
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java | 1
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_one.html | 5
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 75 ++++++++---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js | 49 +++++--
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 84 +++++++++-----
cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js | 9
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 11 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 19 ---
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 12 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TSiteListOne.html | 1
14 files changed, 229 insertions(+), 129 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 83b204e..7ad7cdc 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -1682,33 +1682,62 @@
List<StoreVos> storeVos = new ArrayList<>();
List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
.eq("pointsMerchandiseId", id));
- if (list.size() > 0) {
- List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
- List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).collect(Collectors.toList());
- List<Store> stores = stoClient.queryStoreByIds(collect);
- if (stores.size() > 0) {
- int a = 0;
- for (Store store : stores) {
- StoreVos storeVos1 = new StoreVos();
- storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
- if (store.getOperatorId()==null){
- storeVos1.setNum2("平台");
- }else if (store.getOperatorId() == 0) {
- storeVos1.setNum2("平台");
- } else {
+ PointsMerchandise byId = pmdsService.getById(id);
- storeVos1.setNum2(store.getOName());
+ if (list.size() > 0) {
+
+ if (byId.getUseScope()==3){
+ // 如果是指定门店
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+
+ List<Store> stores = stoClient.queryStoreByIds(collect);
+ if (stores.size() > 0) {
+ int a = 0;
+ for (Store store : stores) {
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
+ if (store.getOperatorId()==null){
+ storeVos1.setNum2("平台");
+ }else if (store.getOperatorId() == 0) {
+ storeVos1.setNum2("平台");
+ } else {
+ storeVos1.setNum2(store.getOName());
+ }
+ storeVos1.setNum3(store.getName());
+ storeVos1.setNum4(store.getIds());
+ storeVos.add(storeVos1);
}
- storeVos1.setNum3(store.getName());
- storeVos1.setNum4(store.getIds());
- if (collect1.get(a)!=null){
- Site site = siteClient.querySiteById(collect1.get(a));
- storeVos1.setNum5(site.getName());
- }
- storeVos1.setNum4(store.getIds());
- storeVos.add(storeVos1);
}
+ }else if (byId.getUseScope()==4){
+ // 如果是指定场地
+ List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).collect(Collectors.toList());
+ int temp =0;
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+ List<Store> stores = stoClient.queryStoreByIds(collect);
+ while (temp!=collect1.size()){
+ for (Store store : stores) {
+ Integer integer = collect1.get(temp);
+ Site site = siteClient.querySiteById(integer);
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum5(site.getName());
+ storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
+ if (store.getOperatorId()==null){
+ storeVos1.setNum2("平台");
+ }else if (store.getOperatorId() == 0) {
+ storeVos1.setNum2("平台");
+ } else {
+ storeVos1.setNum2(store.getOName());
+ }
+ storeVos1.setNum3(store.getName());
+ storeVos1.setNum4(store.getIds());
+ storeVos.add(storeVos1);
+ temp++;
+ }
+ }
+
+
}
+
}
return storeVos;
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java
index 5b2c871..571059d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Site.java
@@ -77,6 +77,7 @@
* 状态（1=正常，2=冻结，3=删除）
*/
private Integer state;
+ private Integer operatorId;
/**
* 添加时间
*/
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupStoreClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupStoreClient.java
index 1f234a5..a581b0f 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupStoreClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupStoreClient.java
@@ -39,4 +39,18 @@
@PostMapping("/worldCup/getWorldCupStoreAllList")
List<WorldCupStore> getWorldCupStoreAllList(Integer worldCupId);
+ /**
+ * 根据门店id获取门店关系数据
+ * @param storeId
+ * @return
+ */
+ @PostMapping("/worldCup/getWorldCupStoreListByStoreId")
+ List<WorldCupStore> getWorldCupStoreListByStoreId(Integer storeId);
+ /**
+ * 根据门店id修改门店关系数据
+ * @param worldCupStores
+ * @return
+ */
+ @PostMapping("/worldCup/updateWorldCupStoreListById")
+ Boolean updateWorldCupStoreListById(List<WorldCupStore> worldCupStores);
}
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 5800575..22318d9 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,30 +561,11 @@
}
}
}
- // 判断所选场地是否一个运营商
- if (StringUtils.hasLength(sites)){
- Integer oid=null;
- String[] split = sites.split(",");
- for (int i = 0; i < split.length; i++) {
- if(i==0){
- Integer operatorId = siteService.getById(split[0]).getOperatorId();
- oid=operatorId;
- }
- Integer operatorId = siteService.getById(split[i]).getOperatorId();
- if(oid!=operatorId){
- return "5004";
- }
- }
- }
-
Integer id = pointMercharsClient.add(pointsMerchandise);
-
String pam = id+"_"+storeIds+"_"+sites;
// 添加多个城市 门店 场地
try{
pointMercharsClient.addOther(pam);
-
-
}catch (Exception e){
e.printStackTrace();
}
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 d80850d..9410708 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
@@ -2,6 +2,7 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,6 +10,8 @@
import com.dsh.course.feignClient.account.CityClient;
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
+import com.dsh.course.feignClient.communityWorldCup.Model.WorldCupStore;
+import com.dsh.course.feignClient.communityWorldCup.WorldCupStoreClient;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.other.model.Site;
import com.dsh.course.mapper.UserMapper;
@@ -28,6 +31,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -85,6 +89,8 @@
private ITSiteService siteService;
@Autowired
private IUserService userService;
+ @Autowired
+ private WorldCupStoreClient worldCupStoreClient;
// 添加SUTU
@@ -168,12 +174,12 @@
}
// if (!roleid.equals("1")){
- TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
- if(operator1!=null){
- model.addAttribute("operator",operator1.getId());
- }else {
- model.addAttribute("operator",0);
- }
+ TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
+ if(operator1!=null){
+ model.addAttribute("operator",operator1.getId());
+ }else {
+ model.addAttribute("operator",0);
+ }
// }
model.addAttribute("yysList",list1);
@@ -216,7 +222,7 @@
}else{
List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>()
.eq("operatorId", operatorId)
- .eq("pid",byId.getId()));
+ .eq("pid",byId.getId()));
if (list.size() == 0){
// 说明管理整个省
TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode()));
@@ -306,7 +312,7 @@
model.addAttribute("list2",list2.getRecords());
String roleid = UserExt.getUser().getRoleid();
- model.addAttribute("role",roleid);
+ model.addAttribute("role",roleid);
model.addAttribute("time",byId.getStartTime()+" - "+byId.getEndTime());
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
@@ -421,11 +427,11 @@
StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8));
model.addAttribute("c8",c8);
model.addAttribute("id",id);
- StoreConfig c9 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,9));
- if (c9==null){
- model.addAttribute("c9",new StoreConfig());
+ List<WorldCupStore> worldCupStores = worldCupStoreClient.getWorldCupStoreListByStoreId(id);
+ if (CollectionUtils.isEmpty(worldCupStores)){
+ model.addAttribute("worldCupStores",new ArrayList<>());
}else{
- model.addAttribute("c9",c9);
+ model.addAttribute("worldCupStores",worldCupStores);
}
return PREFIX + "TShop_imgAll.html";
}
@@ -484,7 +490,7 @@
if(list1.size()>0){
if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>().eq("code",tStore.getProvinceCode())
- .eq("operatorId",yyId));
+ .eq("operatorId",yyId));
TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
@@ -549,13 +555,13 @@
user.setStatus(1);
userMapper.insert(user);
tStore.setStoreStaffId(user.getId());
- tStore.setLon(lon);
- tStore.setLat(lat);
- if (yyId == null || yyId == 0){
- tStore.setOperatorId(0);
- }else{
- tStore.setOperatorId(yyId);
- }
+ tStore.setLon(lon);
+ tStore.setLat(lat);
+ if (yyId == null || yyId == 0){
+ tStore.setOperatorId(0);
+ }else{
+ tStore.setOperatorId(yyId);
+ }
if (UserExt.getUser().getObjectType()==2){
tStore.setOperatorId(UserExt.getUser().getObjectId());
}
@@ -716,9 +722,9 @@
}
@RequestMapping(value = "/saveImgAll")
@ResponseBody
- public Object saveImgAll(Integer id,Integer px1,Integer px2,Integer px3,Integer px4,Integer px5,Integer px6,Integer px7,Integer px8,Integer px9,
- String c1,String c2,String c3,String c4,String c5,String c6,String c7,String c8,String c9,
- Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8,Integer r9) {
+ public Object saveImgAll(Integer id,Integer px1,Integer px2,Integer px3,Integer px4,Integer px5,Integer px6,Integer px7,Integer px8,
+ String c1,String c2,String c3,String c4,String c5,String c6,String c7,String c8,
+ Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8,String str) {
try {
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
StoreConfig collect1 = collect(id, px1, r1, c1, 1);
@@ -737,9 +743,27 @@
storeConfigs.add(collect6);
storeConfigs.add(collect7);
storeConfigs.add(collect8);
- StoreConfig collect9 = collect(id, px9, r9, c9, 9);
- storeConfigs.add(collect9);
storeConfigService.updateBatchById(storeConfigs);
+
+ // 修改世界杯
+ JSONArray jsonArray = JSONObject.parseArray(str);
+ List<WorldCupStore> worldCupStores = new ArrayList<>();
+ for (Object o : jsonArray) {
+ String s = JSONObject.toJSONString(o);
+ JSONObject jsonObject = JSONObject.parseObject(s);
+ Integer id1 = jsonObject.getInteger("id");
+ String backgroundImage = jsonObject.getString("backgroundImage");
+ Integer isOpen = jsonObject.getInteger("isOpen");
+ Integer sort = jsonObject.getInteger("sort");
+ WorldCupStore worldCupStore = new WorldCupStore();
+ worldCupStore.setSort(sort);
+ worldCupStore.setId(id1);
+ worldCupStore.setBackgroundImage(backgroundImage);
+ worldCupStore.setIsOpen(isOpen);
+ worldCupStores.add(worldCupStore);
+ }
+ worldCupStoreClient.updateWorldCupStoreListById(worldCupStores);
+
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
@@ -1006,7 +1030,7 @@
@ResponseBody
public Object addConfigOne(String url,String name,Integer page,Integer type,String turnId,Integer sort) {
try {
- storeService.addConfigOne(url,name,page,type,turnId,sort);
+ storeService.addConfigOne(url,name,page,type,turnId,sort);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -1039,7 +1063,7 @@
}
- return SUCCESS_TIP;
+ return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
return ERROR;
@@ -1055,7 +1079,7 @@
storeOtherService.updateById(byId);
- return SUCCESS_TIP;
+ return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
return ERROR;
@@ -1117,9 +1141,9 @@
@RequestMapping(value = "/addConfigOne9")
@ResponseBody
public Object addConfigOne9(String url,String name,Integer page,Integer type,String turnId,Integer sort,Integer id) {
- try {
+ try {
TStoreOtherConfigTrue byId = new TStoreOtherConfigTrue();
- byId.setPid(id);
+ byId.setPid(id);
if(ToolUtil.isNotEmpty(url)){
byId.setUrl(url);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index a7e4c49..ac910e3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -109,7 +109,6 @@
@RequestMapping("/tolist")
public String tolist(Model model) {
-
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("list",list);
String roleid = UserExt.getUser().getRoleid();
@@ -357,12 +356,11 @@
game.setBlue(""+sutuId);
game.setRed(""+sutuId1);
- // 生成设备二维码
+ // 生成红蓝sutu二维码
HashMap<String, String> blueCode = new HashMap<>();
blueCode.put("scan_type", "1000");
blueCode.put("sutu_id", ""+sutuId);
blueCode.put("space_id", st.getId() + "");
-
HashMap<String, String> redCode = new HashMap<>();
redCode.put("scan_type", "1000");
redCode.put("sutu_id", sutuId1+"");
@@ -377,16 +375,10 @@
MultipartFile redFile = convert(redImage, new Date().getTime()+UUIDUtil.getRandomCode(3)+".PNG");
String s = OssUploadUtil.ossUpload("img/", blueFile);
String s1 = OssUploadUtil.ossUpload("img/", redFile);
-// MultipartFile multipartFile = convert(blueImage);
-// MultipartFile multipartFile1 = convert(redImage);
-//
-// String s = OssUploadUtil.ossUpload("img/", multipartFile);
-// String s1 = OssUploadUtil.ossUpload("img/", multipartFile1);
game.setBlueCode(s);
game.setRedCode(s1);
Integer gameId = ballClient.save(game);
List<TGameConfig> gameConfigList = new ArrayList<>();
-
//玩湃跨城赛
TGameConfig gameConfigkuacheng = new TGameConfig();
gameConfigkuacheng.setId(kcId);
@@ -400,9 +392,7 @@
System.out.println("========gameConfig======"+gameConfigkuacheng);
gameConfigList.add(gameConfigkuacheng);
System.out.println("======gameConfigList======="+gameConfigList);
-
//社区冠军赛
-
TGameConfig gameConfigshequ = new TGameConfig();
gameConfigshequ.setId(shequIId);
gameConfigshequ.setGameId(shequId);
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 0fbec6a..6cffee2 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 and t1.isCanBeBooked = 1 and t1.reservation=1
+ where t1.state=1 and t2.state=1 and t1.isCanBeBooked = 0 and t1.reservation=0
<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/TGoods_detail_one.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_one.html
index fd50b51..8bff237 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_one.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_one.html
@@ -165,13 +165,18 @@
<td>闸机id</td>
</tr>
</thead>
+ <tbody>
@for(s in sites){
+ <tr>
<td>${s.num1}</td>
<td>${s.num2}</td>
<td>${s.num3}</td>
<td>${s.num5}</td>
<td>${s.num4}</td>
+ </tr>
@}
+ </tbody>
+
</table>
@}
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 dbff552..1909287 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
@@ -86,7 +86,6 @@
var content = "<option value=''>请选择</option>";
var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
if(data!=null){
-
$.each(data, function(k,v) {
content += "<option value='"+v.name+"'>"+v.name+"</option>";
});
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html
index 2f346f1..ab0eff3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html
@@ -12,26 +12,26 @@
<input hidden id="s6" value="${c6.isOpen}">
<input hidden id="s7" value="${c7.isOpen}">
<input hidden id="s8" value="${c8.isOpen}">
- <input hidden id="s9" value="${c9.isOpen}">
+ <input hidden id="s9" value="${worldCupStores}">
<div class="row">
<div class="col-lg-6" style="">
<div class="form-group" style="margin-left: 96px">
<label class="col-sm-4 control-label" >
- 报名玩湃课程：<input type="radio" name="r1" value="1">开启 <input type="radio" name="r1" value="0">关闭
+ 报名玩湃课程：<input type="radio" name="r1" value="1">开启 <input type="radio" name="r1" value="0">关闭
</label>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">排序：</label>
- <div class="col-sm-9">
- <input class="form-control" style="width: 200px;" type="text" id="px1" value="${c1.sort}">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">排序：</label>
+ <div class="col-sm-9">
+ <input class="form-control" style="width: 200px;" type="text" id="px1" value="${c1.sort}">
+ </div>
</div>
- </div>
- @if(c1==null){
- <#avatar id="c1" name="背景图" />
- @}
- @if(c1!=null){
- <#avatar id="c1" name="背景图" avatarImg="${c1.backgroundImage}"/>
- @}
+ @if(c1==null){
+ <#avatar id="c1" name="背景图" />
+ @}
+ @if(c1!=null){
+ <#avatar id="c1" name="背景图" avatarImg="${c1.backgroundImage}"/>
+ @}
</div>
<div class="col-lg-6" style="">
<div class="form-group" style="margin-left: 96px">
@@ -183,27 +183,32 @@
</div>
<div style="font-size: x-large;">社区世界杯板块</div>
+ @for(obj in worldCupStores){
<div class="row">
+ <input hidden name="cupId" value="${obj.id}">
+ <input hidden name="backgroundImage" value="${obj.backgroundImage}">
+ <input hidden name="isOpen" value="${obj.isOpen}">
<div class="col-lg-6" style="">
<div class="form-group" style="margin-left: 96px">
<label class="col-sm-4 control-label" >
- 社区世界杯：<input type="radio" name="r9" value="1">开启 <input type="radio" name="r9" value="0">关闭
+ 社区世界杯：<input type="radio" name="${obj.id}" value="1" ${obj.isOpen == 1 ? 'checked' : ''}>开启 <input type="radio" name="${obj.id}" value="0" ${obj.isOpen == 0 ? 'checked' : ''}>关闭
</label>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">排序：</label>
<div class="col-sm-9">
- <input class="form-control" style="width: 200px;" type="text" id="px9" value="${c9.sort}">
+ <input class="form-control" style="width: 200px;" type="text" name="px9" value="${obj.sort}">
</div>
</div>
- @if(c9==null){
- <#avatar id="c9" name="背景图" />
+ @if(obj==null){
+ <#avatar id="${obj.id}" name="背景图" />
@}
- @if(c9!=null){
- <#avatar id="c9" name="背景图" avatarImg="${c9.backgroundImage}"/>
+ @if(obj!=null){
+ <#avatar id="${obj.id}" name="背景图" avatarImg="${obj.backgroundImage}"/>
@}
</div>
</div>
+ @}
<div style="font-size: x-large;">首页其他板块设置</div>
<#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition(id)"/>
@@ -279,13 +284,32 @@
}
}
- var OBJradio=document.getElementsByName("r9")
- for(i=0;i<OBJradio.length;i++){//循环查找这个radio
- if($("#s9").val()==OBJradio[i].value){//判断是否与radio的值相同
- OBJradio[i].checked=true//修改选中状态
- }
- }
+ // for (let i = 0; i < $('input[name="isOpen"]').length; i++) {
+ // var OBJradio=document.getElementsByName("r9")
+ // for(i=0;i<OBJradio.length;i++){//循环查找这个radio
+ // if([i].isOpen==OBJradio[i].value){//判断是否与radio的值相同
+ // OBJradio[i].checked=true//修改选中状态
+ // }
+ // }
+ // }
+ // var arrStr = $("#s9").val();
+ // arrStr = arrStr.replaceAll("WorldCupStore(","{")
+ // arrStr = arrStr.replaceAll(")","}")
+ // arrStr = arrStr.replaceAll("=",":")
+ // console.log(arrStr)
+ // var arr = []
+ // arr = JSON.parse(arrStr)
+ // console.log(arr)
+ // for (let i = 0; i < arr.length; i++) {
+ // console.log(arr[i])
+ // var OBJradio=document.getElementsByName("r9")
+ // for(i=0;i<OBJradio.length;i++){//循环查找这个radio
+ // if(arr[i].isOpen==OBJradio[i].value){//判断是否与radio的值相同
+ // OBJradio[i].checked=true//修改选中状态
+ // }
+ // }
+ // }
}
</script>
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 79d8665..86876ae 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
@@ -54,22 +54,23 @@
var name ='';
for(var i in selected){
if(typeof selected[i].id != "undefined"){
- console.log( selected[i].ids,55555)
- name = selected[0].accountName
- if(name!=selected[i].accountName){
+ name = selected[0].account
+ if(name!=selected[i].account){
Feng.info("请选择相同运营商场地")
return ;
}
arr.push({
id: selected[i].id,
provinceCity: typeof selected[i].provinceCity != "undefined" ? selected[i].provinceCity : "",
- accountName: typeof selected[i].accountName != "undefined" ? selected[i].accountName : "",
+ accountName: typeof selected[i].account != "undefined" ? selected[i].account : "",
name: typeof selected[i].name != "undefined" ? selected[i].name : "",
siteName: typeof selected[i].siteName != "undefined" ? selected[i].siteName : "",
ids:typeof selected[i].ids != "undefined" ? selected[i].ids : "",
})
}
}
+ console.log("看看选择的场地")
+ console.log(arr)
window.parent.TGoodsInfoDlg.selecUserOpt1(arr);
TStoreProvince.storeOfClosePage();
}
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 40c0de1..f18d924 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
@@ -167,6 +167,7 @@
}
TGoodsInfoDlg.selecUserOpt1 = function (arrays){
console.log("进入")
+ console.log(arrays)
//获取所有的值
var subArr= this.siteIds;
console.log(subArr)
@@ -190,7 +191,7 @@
'<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name +
'<td><input type="hidden" id="siteName" name="siteName" value="'+arrays[i].siteName+'">' + arrays[i].siteName +
'<td><input type="hidden" id="ids" name="ids" value="'+arrays[i].ids+'">' + arrays[i].ids +
- '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
+ '</td><td><button onclick="deleteSub1(this)">移除</button></td></tr>';
}
}
$("#coun1").append(str);
@@ -203,6 +204,14 @@
$(e).parent().parent().remove();
console.log('storeIds',TGoodsInfoDlg.storeIds)
}
+function deleteSub1(e) {
+ console.log(e);
+ var row = $(e).closest('tr');
+ var value = row.find('#id').val();
+ TGoodsInfoDlg.siteIds.splice(TGoodsInfoDlg.siteIds.indexOf(parseInt(value)), 1)
+ $(e).parent().parent().remove();
+ console.log('siteIds',TGoodsInfoDlg.siteIds)
+}
TGoodsInfoDlg.delete = function (o) {
$(o).parent("div").remove()
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js
index 417f463..c9d5e92 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js
@@ -312,6 +312,10 @@
};
+TCompetition.close = function() {
+ parent.layer.close(parent.layer.getFrameIndex(window.name));
+};
+
TCompetition.saveAllImg = function (e) {
var id = $("#id").val()
var px1 = $("#px1").val()
@@ -322,7 +326,6 @@
var px6 = $("#px6").val()
var px7 = $("#px7").val()
var px8 = $("#px8").val()
- var px9 = $("#px9").val()
var c1 = $("#c1").val()
var c2 = $("#c2").val()
var c3 = $("#c3").val()
@@ -331,7 +334,6 @@
var c6 = $("#c6").val()
var c7 = $("#7").val()
var c8 = $("#c8").val()
- var c9 = $("#c9").val()
var r1 = document.querySelector('input[name="r1"]').checked;
var r2 = document.querySelector('input[name="r2"]').checked;
var r3 = document.querySelector('input[name="r3"]').checked;
@@ -340,7 +342,28 @@
var r6 = document.querySelector('input[name="r6"]').checked;
var r7 = document.querySelector('input[name="r7"]').checked;
var r8 = document.querySelector('input[name="r8"]').checked;
- var r9 = document.querySelector('input[name="r9"]').checked;
+
+ var json1=[];
+ for (let i = 0; i < $('input[name="px9"]').length; i++) {
+ var arr = {}
+ var id = $($('input[name="cupId"]')[i]).val()
+ console.log(i+$("#"+id).val())
+ var str = $("#"+id).val();
+ if($("#"+id).val() == null || $("#"+id).val() == ""){
+ arr['backgroundImage'] = $($('input[name="backgroundImage"]')[i]).val();
+ }else {
+ arr['backgroundImage'] = str;
+ }
+ if(document.querySelector('input[name="'+ id +'"]').checked){
+ arr['isOpen'] = 1;
+ }else {
+ arr['isOpen'] = 0;
+ }
+ arr['sort'] = Number($($('input[name="px9"]')[i]).val());
+ arr['id'] = Number($($('input[name="cupId"]')[i]).val());
+ console.log(arr)
+ json1.push(arr)
+ }
if(r1){
r1 =1
}else{
@@ -381,15 +404,11 @@
}else{
r8=0
}
- if(r9){
- r9 =1
- }else{
- r9=0
- }
var ajax = new $ax(Feng.ctxPath + "/tShop/saveImgAll", function(data){
if(data.code == 200){
Feng.success("保存成功!");
+ TCompetition.close();
}else{
Feng.error(data.msg);
}
@@ -406,7 +425,6 @@
ajax.set("px6",px6);
ajax.set("px7",px7);
ajax.set("px8",px8);
- ajax.set("px9",px9);
ajax.set("c1",c1);
ajax.set("c2",c2);
ajax.set("c3",c3);
@@ -415,7 +433,6 @@
ajax.set("c6",c6);
ajax.set("c7",c7);
ajax.set("c8",c8);
- ajax.set("c9",c9);
ajax.set("r1",r1);
ajax.set("r2",r2);
ajax.set("r3",r3);
@@ -424,7 +441,7 @@
ajax.set("r6",r6);
ajax.set("r7",r7);
ajax.set("r8",r8);
- ajax.set("r9",r9);
+ ajax.set("str",JSON.stringify(json1));
ajax.start();
}
@@ -494,9 +511,13 @@
var carPhoto = new $WebUpload("c8");
carPhoto.setUploadBarId("progressBar");
carPhoto.init();
- var carPhoto = new $WebUpload("c9");
- carPhoto.setUploadBarId("progressBar");
- carPhoto.init();
+
+ for (let i = 0; i < $('input[name="px9"]').length; i++) {
+ var id = $($('input[name="cupId"]')[i]).val()
+ var carPhoto = new $WebUpload(id);
+ carPhoto.setUploadBarId("progressBar");
+ carPhoto.init();
+ }
var carPhoto = new $WebUpload("img");
carPhoto.setUploadBarId("progressBar");
carPhoto.init();
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 5dbf961..ad0f640 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
@@ -446,6 +446,7 @@
introduce:"",
imgs:"",
reservation:"",
+ isCanBeBooked:"",
};
data.province = $("#pCode").val()
@@ -472,6 +473,7 @@
var reservation= $("input[name='reservation']:checked").val();
data.reservation= reservation;
+ data.isCanBeBooked= reservation;
console.log("看看是否可预约值")
console.log(reservation);
if (reservation==1){
--
Gitblit v1.7.1