From 562ccac1d78a2dc3e5936ef2c6dd77d22ebbfb0e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 四月 2025 18:10:18 +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/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 51 ++++++++++++++++++-------
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_imgAll.html | 38 ++++++++++++++++++-
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOther.js | 15 +++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreConfig.java | 2
4 files changed, 88 insertions(+), 18 deletions(-)
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 b793c91..4bd9598 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
@@ -1,7 +1,6 @@
package com.dsh.guns.modular.system.controller.code;
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;
@@ -14,33 +13,50 @@
import com.dsh.course.feignClient.communityWorldCup.Model.WorldCupStoreVO;
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;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.*;
-import com.dsh.guns.modular.system.util.GaoDeMapUtil;
+import com.dsh.guns.modular.system.model.StoreConfig;
+import com.dsh.guns.modular.system.model.TCity;
+import com.dsh.guns.modular.system.model.TOperator;
+import com.dsh.guns.modular.system.model.TOperatorCity;
+import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.model.TStoreListVo;
+import com.dsh.guns.modular.system.model.TStoreOther;
+import com.dsh.guns.modular.system.model.TStoreOtherConfig;
+import com.dsh.guns.modular.system.model.TStoreOtherConfigTrue;
+import com.dsh.guns.modular.system.model.TTurn;
+import com.dsh.guns.modular.system.model.User;
+import com.dsh.guns.modular.system.service.ICityService;
+import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.service.ITSiteService;
+import com.dsh.guns.modular.system.service.IUserService;
+import com.dsh.guns.modular.system.service.StoreConfigService;
+import com.dsh.guns.modular.system.service.TOperatorCityService;
+import com.dsh.guns.modular.system.service.TOperatorService;
+import com.dsh.guns.modular.system.service.TStoreOtherConfigService;
+import com.dsh.guns.modular.system.service.TStoreOtherConfigTrueService;
+import com.dsh.guns.modular.system.service.TStoreOtherService;
+import com.dsh.guns.modular.system.service.TTurnService;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
-import io.swagger.models.auth.In;
-import org.apache.poi.ss.formula.functions.T;
-import org.bouncycastle.math.raw.Mod;
import org.springframework.beans.BeanUtils;
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;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 车辆管理控制器
@@ -434,6 +450,9 @@
}else{
model.addAttribute("worldCupStores",worldCupStores);
}
+ //惠民卡
+ StoreConfig c10 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,10));
+ model.addAttribute("c10",c10);
return PREFIX + "TShop_imgAll.html";
}
@@ -722,9 +741,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,
- 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) {
+ public Object saveImgAll(Integer id,Integer px1,Integer px2,Integer px3,Integer px4,Integer px5,Integer px6,Integer px7,Integer px8,Integer px10,
+ String c1,String c2,String c3,String c4,String c5,String c6,String c7,String c8,String c10,
+ Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8,Integer r10,String str) {
try {
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
StoreConfig collect1 = collect(id, px1, r1, c1, 1);
@@ -735,6 +754,7 @@
StoreConfig collect6 = collect(id, px6, r6, c6, 6);
StoreConfig collect7 = collect(id, px7, r7, c7, 7);
StoreConfig collect8 = collect(id, px8, r8, c8, 8);
+ StoreConfig collect10 = collect(id, px10, r10, c10, 10);
storeConfigs.add(collect1);
storeConfigs.add(collect2);
storeConfigs.add(collect3);
@@ -743,7 +763,8 @@
storeConfigs.add(collect6);
storeConfigs.add(collect7);
storeConfigs.add(collect8);
- storeConfigService.updateBatchById(storeConfigs);
+ storeConfigs.add(collect10);
+ storeConfigService.saveOrUpdateBatch(storeConfigs);
// 修改世界杯
JSONArray jsonArray = JSONObject.parseArray(str);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreConfig.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreConfig.java
index e69c697..ea3814d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreConfig.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreConfig.java
@@ -38,7 +38,7 @@
@TableField("storeId")
private Integer storeId;
/**
- * 数据类型（1=报名玩湃课程，2=预约场地，3=报名赛事及活动，4=免费福利，5=线上课程积分，6=购买优惠门票，7=看视频得奖励，8=智慧球场）
+ * 数据类型（1=报名玩湃课程，2=预约场地，3=报名赛事及活动，4=免费福利，5=线上课程积分，6=购买优惠门票，7=看视频得奖励，8=智慧球场，9=世界杯，10=惠民卡）
*/
@TableField("type")
private Integer type;
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 a5413eb..7a5377f 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
@@ -28,6 +28,9 @@
<input hidden id="s8" value="${c8.isOpen}">
@}
<input hidden id="s9" value="${worldCupStores}">
+ @if(c10!=null){
+ <input hidden id="s10" value="${c10.isOpen}">
+ @}
<div class="row">
<div class="col-lg-6" style="">
<div class="form-group" style="margin-left: 96px">
@@ -265,7 +268,33 @@
</div>
</div>
@}
-
+ <div style="font-size: x-large;">惠民卡板块</div>
+ <div class="form-group">
+ <div class="col-lg-6" style="">
+ <div class="form-group" style="margin-left: 96px">
+ <label class="col-sm-3 control-label" >
+ 惠民卡：<input type="radio" name="r10" value="1">开启 <input type="radio" name="r10" value="0">关闭
+ </label>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">排序：</label>
+ <div class="col-sm-9">
+ @if(c10==null){
+ <input class="form-control" style="width: 200px;" type="text" id="px10" value="">
+ @}
+ @if(c10!=null){
+ <input class="form-control" style="width: 200px;" type="text" id="px10" value="${c10.sort}">
+ @}
+ </div>
+ </div>
+ @if(c10==null){
+ <#avatar id="c10" name="背景图" />
+ @}
+ @if(c10!=null){
+ <#avatar id="c10" name="背景图" avatarImg="${c10.backgroundImage}"/>
+ @}
+ </div>
+ </div>
<div style="font-size: x-large;">首页其他板块设置</div>
<#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition(id)"/>
<#button name="编辑" icon="fa-edit" clickFun="TCompetition.openTCompetitionDetail1()" space="true"/>
@@ -339,7 +368,12 @@
OBJradio[i].checked=true//修改选中状态
}
}
-
+ var OBJradio=document.getElementsByName("r10")
+ for(i=0;i<OBJradio.length;i++){//循环查找这个radio
+ if($("#s10").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
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 947d00e..8384dc2 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
@@ -326,6 +326,7 @@
var px6 = $("#px6").val()
var px7 = $("#px7").val()
var px8 = $("#px8").val()
+ var px10 = $("#px10").val()
var c1 = $("#c1").val()
var c2 = $("#c2").val()
var c3 = $("#c3").val()
@@ -334,6 +335,7 @@
var c6 = $("#c6").val()
var c7 = $("#7").val()
var c8 = $("#c8").val()
+ var c10 = $("#c10").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;
@@ -342,6 +344,7 @@
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 r10 = document.querySelector('input[name="r10"]').checked;
var json1=[];
for (let i = 0; i < $('input[name="px9"]').length; i++) {
@@ -404,6 +407,11 @@
}else{
r8=0
}
+ if(r10){
+ r10 =1
+ }else{
+ r10=0
+ }
var ajax = new $ax(Feng.ctxPath + "/tShop/saveImgAll", function(data){
if(data.code == 200){
@@ -425,6 +433,7 @@
ajax.set("px6",px6);
ajax.set("px7",px7);
ajax.set("px8",px8);
+ ajax.set("px10",px10);
ajax.set("c1",c1);
ajax.set("c2",c2);
ajax.set("c3",c3);
@@ -433,6 +442,7 @@
ajax.set("c6",c6);
ajax.set("c7",c7);
ajax.set("c8",c8);
+ ajax.set("c10",c10);
ajax.set("r1",r1);
ajax.set("r2",r2);
ajax.set("r3",r3);
@@ -441,6 +451,7 @@
ajax.set("r6",r6);
ajax.set("r7",r7);
ajax.set("r8",r8);
+ ajax.set("r10",r10);
ajax.set("str",JSON.stringify(json1));
ajax.start();
}
@@ -511,6 +522,10 @@
var carPhoto = new $WebUpload("c8");
carPhoto.setUploadBarId("progressBar");
carPhoto.init();
+ var carPhoto = new $WebUpload("c10");
+ carPhoto.setUploadBarId("progressBar");
+ carPhoto.init();
+
for (let i = 0; i < $('input[name="px9"]').length; i++) {
var id = $($('input[name="cupId"]')[i]).val()
--
Gitblit v1.7.1