From 1e790795f4e2c365f604ecc0fc1b290e3ff3c35f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 20 十月 2023 09:34:22 +0800
Subject: [PATCH] 更新bug
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html | 5
cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html | 11 +-
cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js | 11 +
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java | 3
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_detail_one.html | 2
cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java | 11 ++
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java | 3
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 2
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 8 +
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java | 7 +
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 14 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html | 1
cloud-server-other/src/main/resources/mapper/StoreMapper.xml | 6 +
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tPay_info.js | 2
cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js | 25 +++-
cloud-server-other/src/main/java/com/dsh/other/entity/Store.java | 4
cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java | 19 +++
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 1
cloud-server-account/src/main/java/com/dsh/account/model/JoinPlayPaiVo.java | 6 +
cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java | 4
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreVos.java | 1
cloud-server-other/src/main/java/com/dsh/other/mapper/StoreMapper.java | 7 +
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 9 +
cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 5 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java | 5 +
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 7 +
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 23 +++-
cloud-server-other/src/main/java/com/dsh/other/service/StoreService.java | 5 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 17 +++
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 13 ++
cloud-server-other/src/main/java/com/dsh/other/util/DateComparisonExample.java | 41 ++++++++
32 files changed, 249 insertions(+), 31 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 39c9797..982bb80 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -90,6 +90,7 @@
detailsVo.setUserImage(tAppUser.getHeadImg());
detailsVo.setUserName(tAppUser.getName());
detailsVo.setUserPhone(tAppUser.getPhone());
+ detailsVo.setIsVip(tAppUser.getIsVip());
if(tAppUser.getGender()!=null){
detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
index 8fa17ce..df3512c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/SiteClient.java
@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
+import java.util.Map;
@FeignClient("mb-cloud-other")
@@ -30,4 +31,8 @@
Integer queryByCode(@RequestBody String code);
@PostMapping("/base/site/queryOperator")
OperatorUser queryOperator(@RequestBody List<Integer> stores);
+
+ @PostMapping("/base/site/game")
+ List<Map<String, Object>> game(Integer appUserId);
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/JoinPlayPaiVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/JoinPlayPaiVo.java
index b0895cb..a749041 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/JoinPlayPaiVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/JoinPlayPaiVo.java
@@ -21,4 +21,10 @@
private String lon;
@ApiModelProperty("门店纬度")
private String lat;
+
+ private String province;
+ private String provinceCode;
+ private String city;
+ private String cityCode;
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java
index 12e5f6e..50c5098 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java
@@ -30,4 +30,6 @@
@ApiModelProperty(value = "会员有效期")
private String memberLifespan;
+ private Integer isVip;
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index be84d36..37fc2c9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -129,6 +129,19 @@
}
// 4.智慧球场
+ List<Map<String,Object>> list = stClient.game(appUserId);
+ if (list.size() > 0 ){
+ for (Map<String,Object> booking : list) {
+ RechargesDetail consumeDetail = new RechargesDetail();
+ consumeDetail.setConsumeName("激战游戏");
+ consumeDetail.setConsumeTime(simpleDateFormat.format(new Date(Long.valueOf(booking.get("time").toString()))));
+ consumeDetail.setConsumeAmount("-"+String.valueOf(booking.get("money")));
+ consumeDetail.setRecordId(2);
+ details.add(consumeDetail);
+ }
+ }
+
+
// 5.充值
List<RechargeRecords> rechargeRecords = this.baseMapper.selectList(new QueryWrapper<RechargeRecords>()
.eq("payStatus", 2)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 49341f6..03f305a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -629,6 +629,10 @@
joinPlayPaiVo.setLat(s.getLat());
joinPlayPaiVo.setStoreId(s.getId());
joinPlayPaiVo.setPhone(s.getPhone());
+ joinPlayPaiVo.setProvince(s.getProvince());
+ joinPlayPaiVo.setProvinceCode(s.getProvinceCode());
+ joinPlayPaiVo.setCity(s.getCity());
+ joinPlayPaiVo.setCityCode(s.getCityCode());
}
return joinPlayPaiVo;
}
@@ -1072,6 +1076,9 @@
if (ToolUtil.isNotEmpty(count) && count >= merchandise.getPickUpQuantity()){
return ResultUtil.error("超过限领数量");
}
+ if (ToolUtil.isNotEmpty(count) && count >= merchandise.getQuantityIssued()){
+ return ResultUtil.error("超过发放数量");
+ }
for (int i = 0; i < goodsNums; i++) {
// 新增积分商品兑换记录
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 455f330..c818370 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
@@ -897,7 +897,14 @@
for (Store store : stores) {
StoreVos storeVos1 = new StoreVos();
storeVos1.setNum1(store.getProvince() +"省"+ store.getCity() +"市");
- storeVos1.setNum2(store.getName());
+ if(store.getOperatorId()==0){
+ storeVos1.setNum2("平台");
+ }else {
+
+ storeVos1.setNum2(store.getOName());
+ }
+ storeVos1.setNum3(store.getName());
+ storeVos1.setNum4(store.getIds());
storeVos.add(storeVos1);
}
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java
index 1400569..5bae959 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/model/Store.java
@@ -106,4 +106,11 @@
*/
private Integer state;
+ @TableField("operatorId")
+ private Integer operatorId;
+
+ @TableField(exist = false)
+ private String oName;
+
+ private String ids;
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java
index aa7ffbb..7311866 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/StoreVos.java
@@ -13,4 +13,7 @@
String num1;
String num2;
+
+ String num3;
+ String num4;
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
index 3809cb0..5bf3e1d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -110,6 +110,9 @@
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
Double num1 = jsonObject.getDouble("deductionAmount");
+ if(num1==null){
+ num1=0d;
+ }
if(price.compareTo(num1) <= 0){
continue;
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index 292229c..f90ee7a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -98,7 +98,7 @@
participantVo.setIdcard(participant.getIdcard());
Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
participantVo.setAge(age);
- Student student = studentClient.queryStudentByPhone(participant.getPhone());
+ Student student = studentClient.queryStudentByPhone(participant.getPhone()==null?"0":participant.getPhone());
if(null != student){
Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
participantVo.setResidueClassHour(integer);
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 876fb08..4caf30c 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
@@ -483,7 +483,6 @@
pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId);
// 代替storeId
pointsMerchandise.setShelves(1);
- Integer id = pointMercharsClient.add(pointsMerchandise);
if(typeAll!=2){
if(useScope==2){
ArrayList<Map<String,String>> objects = new ArrayList<>();
@@ -495,11 +494,25 @@
map.put("pCode",pCity.getCode());
map.put("cName",tCity.getName());
map.put("cCode",tCity.getCode());
- map.put("id",id.toString());
+ map.put("id","0");
objects.add(map);
}
pointMercharsClient.addCitys(objects);
}else if(useScope==3){
+
+ Integer oid=null;
+ String[] split = storeIds.split(",");
+ for (int i = 0; i < split.length; i++) {
+ if(i==0){
+ Integer operatorId = storeService.getById(split[0]).getOperatorId();
+ oid=operatorId;
+ }
+ Integer operatorId = storeService.getById(split[i]).getOperatorId();
+ if(oid!=operatorId){
+ return "5003";
+ }
+ }
+ Integer id = pointMercharsClient.add(pointsMerchandise);
String pam = id+"_"+storeIds;
// 添加多个城市 门店
try{
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreVos.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreVos.java
index 1ce4dc4..e41357d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreVos.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/StoreVos.java
@@ -15,4 +15,5 @@
String num2;
String num3;
+ String num4;
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
index 19e7605..d710ed1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/gameData/GameData.html
@@ -217,7 +217,7 @@
<div class="row" id="content4" style="margin-left: 100px;">
<div class="col-sm-11">
<div class="form-group">
- <span id="totalNumber4">全球场次总数：</span>
+ <span id="totalNumber4">全球场次总数：<span id="num" style="color:red"></span>场
</div>
</div>
<div class="col-sm-11" style="display: flex">
@@ -266,7 +266,6 @@
</div>
<#button name="搜索" icon="fa-search" clickFun="TSite1.search4()"/>
</div>
-
<#table id="TSiteTable1"/>
</div>
</div>
@@ -564,7 +563,7 @@
// 获取90°准度赛全球场次总数
var ajax4 = new $ax(Feng.ctxPath + "/gameData/cityGameOne", function(data){
var totalNumber4= document.getElementById("totalNumber4");
- totalNumber4.innerText = "全球场次总数:"+data.totalNum;
+ $("#num").text(data.totalNum)
});
ajax4.start();
// 基于准备好的dom，初始化echarts实例
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html
index 05930b2..4149c09 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_add.html
@@ -442,7 +442,6 @@
}else {
$("#b2").hide()
$("#b1").show()
- $("#ticket").show()
}
}
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 41ec1ba..b1aa18b 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
@@ -124,12 +124,14 @@
<td>所在省市</td>
<td>所属账号</td>
<td>门店名称</td>
+ <td>闸机id</td>
</tr>
</thead>
@for(s in store){
<td>${s.num1}</td>
<td>${s.num2}</td>
<td>${s.num3}</td>
+ <td>${s.num4}</td>
@}
</table>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
index e993123..5f37019 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ticket/ticket_add.html
@@ -135,18 +135,18 @@
<div class="form-group">
<div class="initialLevel col-sm-12 control-label form-group">
<label class="col-sm-3">*兑换地点: </label>
- <div class="col-sm-2" id="belongsNationwide" >
+ <div class="col-sm-2" id="belongsNationwide" hidden >
<input class="col-sm-1" onclick="scopeOfApplication1()" name="company" type="radio"
- value="1" checked style="margin-top: 10px"/>
+ value="1" style="margin-top: 10px"/>
<label class="col-sm-1" style="width: 38%;margin-top: 7px">全国通用</label>
</div>
- <div class="col-sm-2" id="belongsCity" >
+ <div class="col-sm-2" id="belongsCity" hidden >
<input class="col-sm-1" name="company" onclick="scopeOfApplication2()" type="radio"
value="2" style="margin-top: 10px"/>
<label class="col-sm-1" style="width: 38%;margin-top: 7px">指定城市</label>
</div>
<div class="col-sm-2" id="belongsStore" >
- <input class="col-sm-1" name="company" onclick="scopeOfApplication3()" type="radio"
+ <input class="col-sm-1" name="company" onclick="scopeOfApplication3()" type="radio" checked
value="3" style="margin-left: 4%;margin-top: 10px;width: 13px;height: 13px"/>
<label class="col-sm-1" style="width: 38%;margin-top: 6px;">指定门店</label>
</div>
@@ -178,7 +178,7 @@
</div>
</div>
- <div class="row" id="storeSelect" hidden="hidden">
+ <div class="row" id="storeSelect" >
<div class="form-group">
<div class="form-group">
<div class="col-sm-12">
@@ -195,6 +195,7 @@
<td>所在省市</td>
<td>所属账号</td>
<td>门店名称</td>
+ <td>闸机id</td>
<td>操作</td>
</tr>
</thead>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js
index 20c0eee..047507f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/TStoreInfo.js
@@ -49,14 +49,21 @@
return false;
}
var arr = [];
- console.log('selected--->',selected)
+ 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){
+ 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 : "",
- name: typeof selected[i].name != "undefined" ? selected[i].name : ""
+ name: typeof selected[i].name != "undefined" ? selected[i].name : "",
+ ids:typeof selected[i].ids != "undefined" ? selected[i].ids : "",
})
}
}
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 0243903..3fcfaf9 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
@@ -127,9 +127,10 @@
this.layerIndex = index;
}
TGoodsInfoDlg.selecUserOpt = function (arrays){
- console.log(arrays)
+
//获取所有的值
var subArr= this.storeIds;
+ console.log(subArr)
$(".timeClass").each(function () {
subArr.push($(this).find("input[name*='id']").val());
});
@@ -147,11 +148,12 @@
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><button onclick="deleteSub(this)">移除</button></td></tr>';
+ '<td><input type="hidden" id="name" name="name" value="'+arrays[i].name+'">' + arrays[i].name +
+ '<td><input type="hidden" id="ids" name="ids" value="'+arrays[i].ids+'">' + arrays[i].ids +
+ '</td><td><button onclick="deleteSub(this)">移除</button></td></tr>';
}
}
$("#coun").append(str);
- console.log('storeIds',this.storeIds)
}
function deleteSub(e) {
console.log(e);
@@ -243,6 +245,7 @@
* 提交添加
*/
TGoodsInfoDlg.addSubmit = function() {
+
this.clearData();
this.collectData();
@@ -370,9 +373,12 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
if(data=="5001"){
- Feng.error("改账号已经存在");
- }else
- if(data.code == 200){
+ Feng.info("改账号已经存在");
+ }else if(data=="5003"){
+ console.log("请选择相同运营商门店")
+ Feng.info("请选择相同运营商门店");
+
+ }else if(data.code == 200){
if(language==1){
Feng.success("添加成功!");
}else if(language==2){
@@ -545,6 +551,10 @@
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
if(data=="5001"){
Feng.error("改账号已经存在");
+ }else if(data=="5003"){
+ console.log("请选择相同运营商门店")
+ Feng.info("请选择相同运营商门店");
+
}else
if(data.code == 200){
if(language==1){
@@ -759,6 +769,9 @@
var ajax = new $ax(Feng.ctxPath + "/tGoods/add", function(data){
if(data=="5001"){
Feng.error("改账号已经存在");
+ }else if(data=="5003"){
+ Feng.info("请选择相同运营商门店");
+
}else
if(data.code == 200){
if(language==1){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tPay_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tPay_info.js
index c76c754..af61688 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tPay_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tPay_info.js
@@ -39,7 +39,7 @@
' <div class="col-sm-11">' +
' <div class="form-group">\n' +
' <label class="col-sm-3 control-label">请选择：</label>\n' +
- ' <div class="col-sm-9">\n' +
+ ' <div class="col-sm-9" style="margin-top: 5px;">\n' +
' <input type="radio" id="areaType1" value="1" name="areaType"> ' +
' <label for="areaType1"> 手环 </label>\n' +
' </div>\n' +
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
index 9ff7dbf..8144008 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java
@@ -121,6 +121,7 @@
tGameRecord.setPayType(type);
tGameRecord.setUserId(uid);
tGameRecord.setNumber(code);
+ tGameRecord.setTime(new Date());
gameRecordService.save(tGameRecord);
if(type==1){
ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", "", code, config.getCash().toString(), "/base/course/weChatPaymentCourseCallback", "APP", "");
@@ -161,6 +162,7 @@
if("SUCCESS".equals(s)){
for (TGameRecord coursePackagePayment : list) {
coursePackagePayment.setStatus(1);
+ coursePackagePayment.setMoney(config.getCash());
coursePackagePayment.setOrderNo(transaction_id);
}
gameRecordService.updateBatchById(list);
@@ -214,6 +216,7 @@
if("TRADE_SUCCESS".equals(s)){
for (TGameRecord coursePackagePayment : list) {
coursePackagePayment.setStatus(1);
+ coursePackagePayment.setMoney(config.getCash());
coursePackagePayment.setOrderNo(tradeNo);
}
gameRecordService.updateBatchById(list);
@@ -233,6 +236,8 @@
}
return alipay;
}else if(type==3){
+ tGameRecord.setMoney(config.getPlayCoin());
+ gameRecordService.updateById(tGameRecord);
AppUser appUser = appUserClient.queryAppUser(uid);
Integer playPaiCoins = appUser.getPlayPaiCoins();
BigDecimal playCoin = config.getPlayCoin();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 60a650f..8ea716e 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -536,6 +536,14 @@
@Autowired
private IOperatorUserService operatorUserService;
+
+ @ResponseBody
+ @PostMapping("/base/site/game")
+ public List<Map<String, Object>> game(@RequestBody Integer appUserId){
+ return service.game(appUserId);
+
+ }
+
@ResponseBody
@PostMapping("/base/site/queryOperator")
public OperatorUser queryOperator(@RequestBody List<Integer> stores){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 6732193..a699e6d 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -39,6 +39,7 @@
@Autowired
private TBackRecordService backRecordService;
+
/**
* 根据城市管理员id获取门店
*/
@@ -219,8 +220,17 @@
@PostMapping("/store/queryStoreByIds")
public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
try {
- return storeService.list(new LambdaQueryWrapper<Store>()
- .in(Store::getId,ids));
+ List<Store> list = storeService.list(new LambdaQueryWrapper<Store>()
+ .in(Store::getId, ids));
+ for (Store store : list) {
+ Integer operatorId = store.getOperatorId();
+ if(operatorId == null){
+ operatorId=-1;
+ }
+ String name = storeService.getOName(operatorId);
+ store.setOName(name);
+ }
+ return list;
}catch (Exception e){
e.printStackTrace();
return new ArrayList<>();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
index e3d3f7a..82662f6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Store.java
@@ -134,6 +134,10 @@
@TableField("operatorId")
private Integer operatorId;
+ @TableField(exist = false)
+ private String oName;
+
+ private String ids;
@Override
protected Serializable pkVal() {
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java b/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java
index ab36246..f1a51b1 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/TGameRecord.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -56,6 +58,8 @@
@TableField("orderNo")
private String orderNo;
+ private Date time;
+
@Override
protected Serializable pkVal() {
diff --git a/cloud-server-other/src/main/java/com/dsh/other/mapper/StoreMapper.java b/cloud-server-other/src/main/java/com/dsh/other/mapper/StoreMapper.java
index 0bacdc4..b13b555 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/mapper/StoreMapper.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/mapper/StoreMapper.java
@@ -8,6 +8,7 @@
import org.aspectj.lang.annotation.DeclareParents;
import java.util.List;
+import java.util.Map;
/**
@@ -55,4 +56,10 @@
* @return
*/
List<Store> getStoreByStoreStaffId(@Param("id") Integer id);
+
+ String getOName(@Param("operatorId") Integer operatorId);
+
+
+ List<Map<String, Object>> game(@Param("appUserId") Integer appUserId);
+
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/StoreService.java b/cloud-server-other/src/main/java/com/dsh/other/service/StoreService.java
index e0da73e..7e86ff6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/StoreService.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/StoreService.java
@@ -6,6 +6,7 @@
import com.dsh.other.model.ProvinceAndCityVo;
import java.util.List;
+import java.util.Map;
/**
@@ -67,4 +68,8 @@
List<Store> getStoreByCityManagerId(Integer id);
List<Store> getStoreByStoreStaffId(Integer id);
+
+ String getOName(Integer operatorId);
+
+ List<Map<String, Object>> game(Integer appUserId);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index d9fa53c..b7f4243 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSON;
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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.other.entity.*;
@@ -246,11 +247,7 @@
}
}
-
-
}
-
-
}
System.out.println("======strings======="+strings);
@@ -266,7 +263,7 @@
String currentTime = appointmentStartTime;
while (currentTime.compareTo(appointmentEndTime) < 0) {
String nextTime=null;
- if("智慧球场".equals(site.getTypeName())){
+ if("智慧场地".equals(site.getTypeName())){
nextTime=getNextTimeOne(currentTime);
}else {
nextTime= getNextTime(currentTime);
@@ -285,9 +282,23 @@
// orderDto.setSelectable(0);
// }
if (strings.contains(timeRange)){
+
orderDto.setSelectable(0);
}else {
+
+ String stime = day+" "+currentTime;
+ String etime = day+" "+nextTime;
orderDto.setSelectable(1);
+ // 查出lock
+ List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+ for (SiteLock siteLock : list) {
+ boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+ if(stringDateBetween){
+ orderDto.setSelectable(0);
+ }
+ }
+
+
}
@@ -297,8 +308,6 @@
System.out.println("-------------"+timeRanges);
return timeRanges;
-
-
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java
index 8c98490..f24fbbc 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java
@@ -54,6 +54,17 @@
return storeMapper.getStoreByStoreStaffId(id);
}
+ @Override
+ public String getOName(Integer operatorId) {
+
+ return this.baseMapper.getOName(operatorId);
+ }
+
+ @Override
+ public List<Map<String, Object>> game(Integer appUserId) {
+ return this.baseMapper.game(appUserId);
+ }
+
/**
* 获取列表数据
diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/DateComparisonExample.java b/cloud-server-other/src/main/java/com/dsh/other/util/DateComparisonExample.java
new file mode 100644
index 0000000..7c250b0
--- /dev/null
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/DateComparisonExample.java
@@ -0,0 +1,41 @@
+package com.dsh.other.util;
+
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateComparisonExample {
+ public static void main(String[] args) {
+ String stringValue = "2023-10-18 00:20:00 - 2023-10-18 00:21:00";
+ Date startDate = parseDate("2023-10-18 00:19:00");
+ Date endDate = parseDate("2023-10-18 00:21:00");
+
+ boolean isBetween = isStringDateBetween(stringValue, startDate, endDate);
+ System.out.println("字符串时间是否在两个 Date 类型之间？" + isBetween);
+ }
+
+ private static Date parseDate(String dateString) {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ try {
+ return formatter.parse(dateString);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static boolean isStringDateBetween(String stringValue, Date startDate, Date endDate) {
+ String[] dateRange = stringValue.split(" - ");
+ Date valueStartDate = parseDate(dateRange[0]);
+ Date valueEndDate = parseDate(dateRange[1]);
+
+ return (valueStartDate.after(startDate) || valueStartDate.equals(startDate))
+ && (valueEndDate.before(endDate) || valueEndDate.equals(endDate));
+ }
+}
\ No newline at end of file
diff --git a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java
index ca148cc..7eeb104 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/util/TaskUtil.java
@@ -1,7 +1,15 @@
package com.dsh.other.util;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dsh.other.entity.SiteBooking;
+import com.dsh.other.mapper.SiteBookingMapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
/**
* @author zhibing.pu
@@ -10,6 +18,8 @@
@Component
public class TaskUtil {
+ @Resource
+ private SiteBookingMapper siteBookingMapper;
/**
* 每隔一分钟去处理的定时任务
@@ -17,6 +27,15 @@
@Scheduled(fixedRate = 60000)
public void taskMinute(){
try {
+ List<SiteBooking> siteBookings = siteBookingMapper.selectList(new LambdaQueryWrapper<SiteBooking>().eq(SiteBooking::getStatus, 0));
+ for (SiteBooking siteBooking : siteBookings) {
+ long time = siteBooking.getInsertTime().getTime();
+ long l = time + 1800 * 1000;
+ if(System.currentTimeMillis()>l){
+ siteBooking.setStatus(5);
+ siteBookingMapper.updateById(siteBooking);
+ }
+ }
//定时修改赛事状态
} catch (Exception e) {
e.printStackTrace();
diff --git a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
index 01bb524..7a2579c 100644
--- a/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/StoreMapper.xml
@@ -25,4 +25,10 @@
<select id="getStoreByStoreStaffId" resultType="com.dsh.other.entity.Store">
select * from t_store where storeStaffId = #{id}
</select>
+ <select id="getOName" resultType="java.lang.String">
+ select name from t_operator where id =#{operatorId}
+ </select>
+ <select id="game" resultType="java.util.Map">
+ select time,money from t_game_record where userId =#{appUserId} and payType =3
+ </select>
</mapper>
--
Gitblit v1.7.1