From 5af417d60d0cc3cd37afacead01c01ac2d7b6970 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 24 十月 2023 16:58:27 +0800
Subject: [PATCH] 10.24。1
---
cloud-server-other/src/main/resources/mapper/TGameConfigMapper.xml | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html | 2
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 2
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js | 10 +++
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js | 11 +++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 4 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html | 8 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 5 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html | 4
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 39 +++++++------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java | 3
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html | 6 +-
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 8 +-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 5 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html | 12 ++-
cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js | 2
18 files changed, 79 insertions(+), 50 deletions(-)
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 8e1ad7a..57b261b 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
@@ -1105,24 +1105,7 @@
return ResultUtil.error("超过发放数量");
}
- for (int i = 0; i < goodsNums; i++) {
-// 新增积分商品兑换记录
- UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
- pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
- pointsMerchandise.setUserId(userIdFormRedis);
- pointsMerchandise.setStatus(1);
- pointsMerchandise.setState(1);
- if (merchandise.getUseScope() == 3){
- if (exchangeType.getGoodsType() == 2){
- CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
- pointsMerchandise.setStoreId(coursePackage.getStoreId());
- }else {
- pointsMerchandise.setStoreId(exchangeType.getStoreId());
- }
- }
- pointsMerchandise.setCode(code);
- mcClient.saveDetailsUserPointMercase(pointsMerchandise);
- }
+
switch (exchangeType.getExchangeType()){
// 积分
@@ -1228,6 +1211,26 @@
default:
break;
}
+
+ for (int i = 0; i < goodsNums; i++) {
+// 新增积分商品兑换记录
+ UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise();
+ pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId());
+ pointsMerchandise.setUserId(userIdFormRedis);
+ pointsMerchandise.setStatus(1);
+ pointsMerchandise.setState(1);
+ if (merchandise.getUseScope() == 3){
+ if (exchangeType.getGoodsType() == 2){
+ CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId());
+ pointsMerchandise.setStoreId(coursePackage.getStoreId());
+ }else {
+ pointsMerchandise.setStoreId(exchangeType.getStoreId());
+ }
+ }
+ pointsMerchandise.setCode(code);
+ mcClient.saveDetailsUserPointMercase(pointsMerchandise);
+ }
+
return ResultUtil.success();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index f15dc36..81bd0d1 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -160,7 +160,7 @@
//分账
- Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
+// Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
// Integer paymentCompetitions = competitionsClient.queryByCode(outTradeNo);
// Integer siteBookings = siteClient.queryByCode(outTradeNo);
// List<Integer> stores = new ArrayList<>();
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java
index f80ffc2..4d5589c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java
@@ -73,6 +73,7 @@
if(ToolUtil.isNotEmpty(search)){
wrapper.like("name", search);
}
+
List<BenefitsVideoClassification> list = benefitsVideoClassificationService.list(wrapper.orderByAsc("sort"));
List<UserBenefitsVideos> userBenefitsVideos = userBenefitsVideosService.list(new QueryWrapper<UserBenefitsVideos>().eq("appUserId", uid));
List<Integer> collect = userBenefitsVideos.stream().map(UserBenefitsVideos::getBenefitsVideosId).collect(Collectors.toList());
@@ -82,7 +83,7 @@
BenefitsVideoClassificationListVo benefitsVideoClassificationListVo = new BenefitsVideoClassificationListVo();
benefitsVideoClassificationListVo.setId(benefitsVideoClassification.getId());
benefitsVideoClassificationListVo.setName(benefitsVideoClassification.getName());
- QueryWrapper<BenefitsVideos> benefitsVideosQueryWrapper = new QueryWrapper<BenefitsVideos>().eq("state", 1);
+ QueryWrapper<BenefitsVideos> benefitsVideosQueryWrapper = new QueryWrapper<BenefitsVideos>().eq("state", 1).eq("benefitsVideoClassificationId",benefitsVideoClassification.getId());
if(collect.size() > 0){
benefitsVideosQueryWrapper.notIn("id", collect);
}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 56f4884..d1b5a09 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -140,12 +140,14 @@
@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
ArrayList<Integer> integers = new ArrayList<>();
- integers.add(1);
- integers.add(2);
+// integers.add(1);
+// integers.add(2);
+ integers.add(3);
+
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
.in("payType",integers)
.eq("appUserId",appUserId)
- .eq("payStatus",3));
+ .eq("payStatus",2));
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 540e8e6..6ff5922 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -138,7 +138,7 @@
List<Store> stores = storeClient.queryStoreListByName(coursePackageList.getSearch());
List<Integer> collect = stores.stream().map(Store::getId).collect(Collectors.toList());
if(collect.size() > 0){
- wrapper.or().in("id", collect);
+ wrapper.or().in("storeId", collect);
}
}
List<TCoursePackage> list = this.list(wrapper.last(" order by sort, insertTime desc"));
@@ -524,6 +524,7 @@
coursePackageInfo.setTime(format.format(coursePackage.getStartTime())+"-"+format.format(coursePackage.getEndTime()));
}
coursePackageInfo.setCoverDrawing(coursePackage.getCoverDrawing());
+
coursePackageInfo.setName(coursePackage.getName());
Store store = storeClient.queryStoreById(coursePackage.getStoreId());
coursePackageInfo.setStoreName(store.getName());
@@ -564,8 +565,6 @@
CoursePackagePaymentConfigVo coursePackagePaymentConfigVo = new CoursePackagePaymentConfigVo();
coursePackagePaymentConfigVo.setId(coursePackagePaymentConfig.getId());
coursePackagePaymentConfigVo.setClassHours(coursePackagePaymentConfig.getClassHours());
-
-
coursePackagePaymentConfigVo.setPlayPaiCoin(coursePackagePaymentConfig.getPlayPaiCoin());
if(ToolUtil.isNotEmpty(coursePackagePaymentConfig.getCashPayment()) && coursePackagePaymentConfig.getCashPayment()>0 && ToolUtil.isNotEmpty(coursePackagePaymentConfig.getPlayPaiCoin()) && coursePackagePaymentConfig.getPlayPaiCoin()>0 ){
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index b8bdf86..824324e 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -221,7 +221,7 @@
*/
@ResponseBody
@RequestMapping(value = "/addOperator")
- public ResultUtil addOperator(String name,String userName,String phone,Integer type ,@RequestParam String comArr) {
+ public ResultUtil addOperator(String name,String userName,String phone,Integer type , String comArr) {
User one = userService.getOne(new QueryWrapper<User>().eq("name", name).eq("phone", phone));
if (one!=null){
return ResultUtil.error("当前管理员名称和电话已存在!");
@@ -230,6 +230,7 @@
user.setName(userName);
user.setPhone(phone);
user.setObjectType(2);
+ userService.save(user);
TOperator data = new TOperator();
data.setUserId(user.getId());
data.setName(name);
@@ -238,7 +239,7 @@
data.setState(1);
operatorService.save(data);
user.setObjectId(data.getId());
- userService.save(user);
+ userService.updateById(user);
if (SinataUtil.isNotEmpty(comArr)){
JSONArray jsonArray = JSON.parseArray(comArr);
int size = jsonArray.size();
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 bf55a00..66d2442 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
@@ -1036,7 +1036,7 @@
*/
@ResponseBody
@PostMapping("/afterClassExercises")
- public ResultUtil afterClassExercises(Long id, Integer courseId, Integer integral){
+ public ResultUtil afterClassExercises(Long id, Integer courseId, Integer integral,Integer packId){
return coursePackageService.afterClassExercises(id, courseId, integral);
}
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 fa4808c..e60548d 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
@@ -693,10 +693,8 @@
@RequestMapping(value = "/deleteTwo")
public Object delete2(Integer id) {
try {
- TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
+ storeOtherConfigService.removeById(id);
- byId.setState(2);
- tStoreOtherConfigTrueService.updateById(byId);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
index 1ca4cf8..0454216 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_info.html
@@ -47,11 +47,13 @@
{
"type": "tpl",
"id": "u:587781d5d181",
- "tpl": "                                    *所属运营商：",
+ "tpl": "                 *所属运营商：",
"inline": true,
"wrapperComponent": "",
"style": {
- "marginLeft": "0"
+ "marginLeft": "0",
+ "fontFamily": "",
+ "fontSize": 18
}
},
{
@@ -254,12 +256,14 @@
},
{
"type": "tpl",
- "tpl": "                                设备ID：",
+ "tpl": "                       设备ID：",
"inline": true,
"wrapperComponent": "",
"id": "u:587781d5d181",
"style": {
- "marginLeft": "0"
+ "marginLeft": "0",
+ "fontFamily": "",
+ "fontSize": 18
}
},
{
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
index f4eef17..0c33d28 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
@@ -75,7 +75,7 @@
<div class="input-group">
<div class="input-group-btn open">
<button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
- 支付方式
+ 状态
</button>
</div>
<select class="form-control" id="state">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html
index 3ced3d4..c6ba114 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_add.html
@@ -103,17 +103,19 @@
<div class="form-group">
<label class="col-sm-3 control-label">现金价格：</label>
<div class="col-sm-4">
- <input class="form-control" id="cash" name="cash" type="text" >
+ <input class="form-control " id="cash" name="cash" type="text" disabled>
+
</div>
+ 元
</div>
<div class="form-group">
<label class="col-sm-3 control-label">玩派币价格：</label>
<div class="col-sm-4">
- <input class="form-control" id="play" name="play" type="text" >
+ <input class="form-control" id="play" name="play" type="text" disabled >
- </div>
+ </div>币
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html
index 6dd45c1..43eef87 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_edit.html
@@ -118,7 +118,7 @@
<label class="col-sm-3 control-label">现金价格：</label>
<div class="col-sm-4">
<input class="form-control" id="cash" name="cash" type="text" value="${money[0]!}" >
- </div>
+ </div>元
</div>
<div class="form-group">
@@ -126,7 +126,7 @@
<div class="col-sm-4">
<input class="form-control" id="play" name="play" type="text" value="${money[1]!}" >
- </div>
+ </div>币
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
index 4ee4007..8da88b9 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue_info.html
@@ -142,7 +142,7 @@
- <div class="form-group">
+ <div class="form-group" id="hi1">
<label class="col-sm-3 control-label">联系电话：</label>
<div class="col-sm-4">
<input class="form-control" id="phone" name="phone" type="text" value="${item.phone}" disabled >
@@ -150,7 +150,7 @@
</div>
</div>
- <div class="form-group">
+ <div class="form-group" id="hi2">
<label class="col-sm-3 control-label">操作人：</label>
<div class="col-sm-4">
<input class="form-control" id="cancelUserId" name="cancelUserId" type="text" value="${cancelUser!}" disabled >
@@ -158,7 +158,7 @@
</div>
</div>
- <div class="form-group" disabled>
+ <div class="form-group" id="hi3" disabled>
<label class="col-sm-3 control-label head-scu-label">*上传凭证：</label>
<div class="col-sm-2">
<div id="introduceDrawingPreId">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
index 7b51d0c..a3718c9 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_edit.html
@@ -85,11 +85,11 @@
</div>
</div>
<div class="form-group" id="siteType">
- <label class="col-sm-3 control-label">*场地类型：</label>
+ <label class="col-sm-3 control-label">*场地分类：</label>
<div class="col-sm-9">
<select style="width: 300px" class="form-control" id="siteTypeId" name = "typeId">
@for(obj in siteType){
- <option value="${obj.id}">${obj.name}</option>
+ <option value="${obj.id}" ${obj.id == list.siteTypeId ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js
index f522e0b..dcdecf0 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js
@@ -673,6 +673,17 @@
$(function () {
+
+ console.log("=======iiiii======"+ window.parent.TStudent.seItem.status)
+
+ if (window.parent.TStudent.seItem.status != 5 ){
+ // Hide the elements with the specified IDs
+ document.getElementById("hi1").style.display = "none";
+ document.getElementById("hi2").style.display = "none";
+ document.getElementById("hi3").style.display = "none";}
+
+
+
$('#provinceCode').change(function () {
let ajax = new $ax(Feng.ctxPath + "/coursePackage/queryCity", function (data) {
let htmlStr = '';
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
index 1897dd6..0620273 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tCompetition/tCompetition_info.js
@@ -404,7 +404,7 @@
ajax.set("name",name);
ajax.set("startTime",startTime);
ajax.set("endTime",endTime);
- ajax.set("rEndTime",registerEndTime);
+ ajax.set("registerEndTime",registerEndTime);
ajax.set("startAge",startAge);
ajax.set("endAge",endAge);
ajax.set("cashPrice",cashPrice);
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js
index a0799ce..57f6acf 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShopOtherTwo.js
@@ -16,7 +16,15 @@
return [
{field: 'selectItem', radio: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
- {title: '图片', field: 'url', visible: role==1?true:false, align: 'center', valign: 'middle',
+ {
+ title: '图片',
+ field: 'url',
+ visible: role == 1 ? true : false,
+ align: 'center',
+ valign: 'middle',
+ formatter: function(value, row, index) {
+ return '<img src="' + value + '" alt="图片" style="width: 100px; height: 100px;">';
+ }
},
{title: '跳转模块', field: 'name', visible: role==1?true:false, align: 'center', valign: 'middle',
},
diff --git a/cloud-server-other/src/main/resources/mapper/TGameConfigMapper.xml b/cloud-server-other/src/main/resources/mapper/TGameConfigMapper.xml
index 618f833..66fb145 100644
--- a/cloud-server-other/src/main/resources/mapper/TGameConfigMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/TGameConfigMapper.xml
@@ -7,7 +7,7 @@
select gc.* ,js.jieshao intro,js.vedio video
from t_game_config gc
left join t_js js on gc.gameId = js.id
- where gc.otherId = #{id} and gc.img !=""
+ where gc.otherId = #{id} and gc.img is not null
</select>
--
Gitblit v1.7.1