From a1cadd023734d1e33f6455ec87fb7e2783d808fe Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 11 三月 2024 16:04:14 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods_info.js | 30 -------
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 98 ++++++++++++------------
cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java | 4 +
cloud-server-management/src/main/webapp/static/modular/system/tGoods/TSiteInfo.js | 6 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java | 14 +++
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 44 +++++++---
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 37 ++++++---
cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js | 2
8 files changed, 127 insertions(+), 108 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 7984939..27f65ba 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
@@ -886,7 +886,7 @@
detailsResponse.setSid(collect);
if (collect.size() > 0) {
// 获取rid
-// List<Integer> rid= stoClient.querySiteIdById(collect);
+// List<Integer> rid= stoClient.querySiteIdById(collect);
//detailsResponse.setRid(rid);
// todo 修改区域id 临时
// 根据门店id 写死区域id 后续调整为门票指定多个区域
@@ -909,11 +909,27 @@
list4.add(43);
detailsResponse.setRid(list4);
}
-
}
}
//======================================================
}
+ }else{
+ // todo 返回门店id 和场地id
+ // 查询指定场地
+ List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>()
+ .eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
+ // 门店
+ ArrayList<Integer> list3 = new ArrayList<>();
+ // 场地
+ ArrayList<Integer> list4 = new ArrayList<>();
+ for (PointsMerchandiseStore temp : list) {
+ Integer storeId = temp.getStoreId();
+ Integer siteId = temp.getSiteId();
+ list3.add(storeId);
+ list4.add(siteId);
+ }
+ detailsResponse.setRid(list4);
+ detailsResponse.setSid(list3);
}
@@ -1787,19 +1803,19 @@
public Boolean addOther(@RequestBody String pam) {
Boolean save = false;
String[] split = pam.split("_");
- if (split.length>2){
- if (StringUtils.hasLength(split[2])){
- for (String s : split[2].split(",")) {
- PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
- pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
- pointsMerchandiseStore.setSiteId(Integer.valueOf(s));
- Site site = siteClient.querySiteById(Integer.valueOf(s));
- pointsMerchandiseStore.setStoreId(site.getStoreId());
- save = pmdstoService.save(pointsMerchandiseStore);
+ if (split.length > 2) {
+ if (StringUtils.hasLength(split[2])) {
+ for (String s : split[2].split(",")) {
+ PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
+ pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
+ pointsMerchandiseStore.setSiteId(Integer.valueOf(s));
+ Site site = siteClient.querySiteById(Integer.valueOf(s));
+ pointsMerchandiseStore.setStoreId(site.getStoreId());
+ save = pmdstoService.save(pointsMerchandiseStore);
+ }
+ // 这个门票是选择的场地
+ return save;
}
- // 这个门票是选择的场地
- return save;
- }
}
for (String s : split[1].split(",")) {
PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java
index 583623b..73913f5 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/communityWorldCup/WorldCupClient.java
@@ -110,6 +110,10 @@
void changeScore(ChangeScore changeScore);
+ @PostMapping("/worldCup/getUserGameRecordList")
+ Map<String, Object> getUserGameRecordList(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList);
+
+
/**
* 获取用户比赛记录
* @param userGameRecordList
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
index a144fe6..cc7c86c 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupRecordsController.java
@@ -167,6 +167,20 @@
}
+
+ /**
+ * 获取用户比赛列表
+ * @param worldCupGameStatisticsInfoList
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/getUserGameRecordList")
+ public Object getUserGameRecordList(WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){
+ return worldCupClient.getUserGameRecordList(worldCupGameStatisticsInfoList);
+ }
+
+
+
/**
* 获取用户比赛记录
* @param userGameRecordList
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 86876ae..172d53e 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
@@ -59,6 +59,8 @@
Feng.info("请选择相同运营商场地")
return ;
}
+ console.log("arr push")
+ console.log(selected[i].id)
arr.push({
id: selected[i].id,
provinceCity: typeof selected[i].provinceCity != "undefined" ? selected[i].provinceCity : "",
@@ -69,11 +71,11 @@
})
}
}
- console.log("看看选择的场地")
+ 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 f18d924..5778de5 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
@@ -140,7 +140,6 @@
TGoodsInfoDlg.selecUserOpt = function (arrays){
//获取所有的值
var subArr= this.storeIds;
- console.log(subArr)
$(".timeClass").each(function () {
subArr.push($(this).find("input[name*='id']").val());
});
@@ -163,11 +162,16 @@
'</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
}
}
+ console.log("添加门店后的场地数组和门店数组")
+ console.log(this.storeIds)
+ console.log(this.siteIds)
$("#coun").append(str);
}
-TGoodsInfoDlg.selecUserOpt1 = function (arrays){
- console.log("进入")
- console.log(arrays)
+TGoodsInfoDlg.selecUserOpt1 = function (arr){
+ console.log(arr)
+ console.log("返回的数组")
+ console.log("此时的site集合")
+ console.log(this.siteIds)
//获取所有的值
var subArr= this.siteIds;
console.log(subArr)
@@ -175,25 +179,29 @@
subArr.push($(this).find("input[name*='id']").val());
});
var str = '';
- for(var i in arrays){
+ for(var i in arr){
var b = true;
for(var j in subArr){
- if(arrays[i].id === Number(subArr[j])){
+ if(arr[i].id === Number(subArr[j])){
b = false;
break
}
}
if(b){
- this.siteIds.push(arrays[i].id)
+ this.siteIds.push(arr[i].id);
+ console.log("场地push")
+ console.log(arr[i].id)
str += '<tr class="timeClass">' +
- '<td><input type="hidden" id="id" name="id" value="'+arrays[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arrays[i].provinceCity+'">' + arrays[i].provinceCity + '</td>' +
- '<td><input type="hidden" id="accountName" name="accountName" value="'+arrays[i].accountName+'">' + arrays[i].accountName + '</td>' +
- '<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><input type="hidden" id="id" name="id" value="'+arr[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arr[i].provinceCity+'">' + arr[i].provinceCity + '</td>' +
+ '<td><input type="hidden" id="accountName" name="accountName" value="'+arr[i].accountName+'">' + arr[i].accountName + '</td>' +
+ '<td><input type="hidden" id="name" name="name" value="'+arr[i].name+'">' + arr[i].name +
+ '<td><input type="hidden" id="siteName" name="siteName" value="'+arr[i].siteName+'">' + arr[i].siteName +
+ '<td><input type="hidden" id="ids" name="ids" value="'+arr[i].ids+'">' + arr[i].ids +
'</td><td><button onclick="deleteSub1(this)">移除</button></td></tr>';
}
}
+ console.log("这是场地ids")
+ console.log(this.siteIds)
$("#coun1").append(str);
}
function deleteSub(e) {
@@ -677,6 +685,9 @@
}
TGoodsInfoDlg.addSubmit1 = function() {
+ console.log("看看门店ids和场地ids")
+ console.log(this.siteIds)
+ console.log(this.storeIds)
var company = 3;
var radioButtons = document.getElementsByName("company");
for (var i = 0; i < radioButtons.length; i++) {
@@ -885,7 +896,6 @@
ajax.set("typeAll",3);
ajax.set("name",name);
ajax.set("price",price);
- ajax.set("sites",sites);
ajax.set("type",type);
ajax.set("integral",integral);
ajax.set("cash",cash);
@@ -897,6 +907,7 @@
ajax.set("startTime",startTime);
ajax.set("useScope",company);
ajax.set("cityIds",cts);
+ ajax.set("sites",sites);
ajax.set("storeIds",stores);
ajax.set("text",text);
ajax.set("sort",sort);
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods_info.js
index ef69ee5..d262caf 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods_info.js
@@ -116,6 +116,7 @@
this.layerIndex = index;
}
TGoodsInfoDlg.selecUserOpt = function (arrays){
+ console.log("这是另一个js")
console.log(arrays)
//获取所有的值
var subArr= this.storeIds;
@@ -142,34 +143,7 @@
$("#coun").append(str);
console.log('storeIds',this.storeIds)
}
-TGoodsInfoDlg.selecUserOpt1 = function (arrays){
- console.log(arrays)
- //获取所有的值
- var subArr= this.storeIds;
- $(".timeClass").each(function () {
- subArr.push($(this).find("input[name*='id']").val());
- });
- var str = '';
- for(var i in arrays){
- var b = true;
- for(var j in subArr){
- if(arrays[i].id === Number(subArr[j])){
- b = false;
- break
- }
- }
- if(b){
- this.storeIds.push(arrays[i].id)
- str += '<tr class="timeClass">' +
- '<td><input type="hidden" id="id" name="id" value="'+arrays[i].id+'"><input type="hidden" id="provinceCity" name="provinceCity" value="'+arrays[i].provinceCity+'">' + arrays[i].provinceCity + '</td>' +
- '<td><input type="hidden" id="accountName" name="accountName" value="'+arrays[i].accountName+'">' + arrays[i].accountName + '</td>' +
- '<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name + '</td>' +
- '<td><input type="hidden" id="siteName" name="siteName" value="'+arrays[i].siteName+'">' + arrays[i].siteName + '</td>' +
- '<td><button onclick="deleteSub(this)">移除</button></td></tr>';
- }
- }
- $("#coun1").append(str);
-}
+
function deleteSub(e) {
console.log(e);
var row = $(e).closest('tr');
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 ad0f640..864806e 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
@@ -476,64 +476,62 @@
data.isCanBeBooked= reservation;
console.log("看看是否可预约值")
console.log(reservation);
- if (reservation==1){
+ 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;
+
+ }
- if (data.typeName === "智慧场地"){
- console.log("===========这是智慧球场")
+ var value1 = data.appointmentEndTime;
+ var lastTwoDigits1 = value1.slice(-2);
- console.log("====="+data.appointmentStartTime)
+ 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;
- 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;
+ 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;
-
- }
- }
}
var SelectValue="";
var getSelectValueMenbers = $("input[name='pt']:checked").each(function(j) {
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
index 092d1c6..2ec1f9e 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/worldCupRecords/worldCupRecords.js
@@ -166,7 +166,7 @@
}
},
];
- var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/worldCupGameStatisticsInfoList", defaultColunms3);
+ var table3 = new BSTable("WorldCupRecordsTable3", "/worldCupRecords/getUserGameRecordList", defaultColunms3);
table3.setPaginationType("server");
WorldCupRecords.table3 = table3.init();
});
--
Gitblit v1.7.1