From b27efc697f2f81e0d0f247a2708e58af52a5df9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 十月 2025 15:14:33 +0800
Subject: [PATCH] bug修改,后台新增修改用户积分
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/UpdateIntegral.java | 19 +++
cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js | 45 +++++++++
cloud-server-account/src/main/java/com/dsh/account/dto/UpdateIntegral.java | 17 +++
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 1
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 4
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java | 3
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue_info.js | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html | 1
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 6 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 19 +++
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java | 1
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 77 ++++++++++----
cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_changeIntegral.html | 90 ++++++++++++++++++
cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java | 4
14 files changed, 263 insertions(+), 30 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 4167f8d..b0148ce 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -4,10 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.R;
-import com.dsh.account.dto.BindDto;
-import com.dsh.account.dto.IntroduceUserQuery;
-import com.dsh.account.dto.SelectDto;
-import com.dsh.account.dto.UpdateInfoDto;
+import com.dsh.account.dto.*;
import com.dsh.account.entity.*;
import com.dsh.account.feignclient.other.VipClient;
import com.dsh.account.model.AddAppUserVo;
@@ -37,6 +34,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.guieffect.qual.UI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -84,6 +82,9 @@
@Autowired
private TAppGiftService appGiftService;
+
+ @Autowired
+ private UserIntegralChangesService userIntegralChangesService;
/**
* 根据介绍有礼id查询当前活动参与次数
@@ -205,7 +206,7 @@
@GetMapping("/base/appUser/getAppUserByPhone/{phone}")
public TAppUser getAppUserByPhone(@PathVariable("phone") String phone) {
TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("phone", phone)
- .eq("state",1));
+ .eq("state", 1));
return appUser;
}
@@ -441,7 +442,7 @@
@ApiImplicitParam(value = "会员卡id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil addVipPayment(Integer payType,Integer id) {
+ public ResultUtil addVipPayment(Integer payType, Integer id) {
if (ToolUtil.isEmpty(payType)) {
return ResultUtil.paranErr("payType");
}
@@ -456,6 +457,7 @@
return ResultUtil.runErr();
}
}
+
@ResponseBody
@PostMapping("/api/appUser/vipPayment")
@ApiOperation(value = "页面数据展示", tags = {"APP-成为会员"})
@@ -474,11 +476,11 @@
res.setHeadImg(appUser.getHeadImg());
res.setName(appUser.getName());
res.setVipEndTime(appUser.getVipEndTime());
- if (appUser.getVipEndTime()==null){
+ if (appUser.getVipEndTime() == null) {
res.setIsVip(0);
- }else if (appUser.getVipEndTime().before(new Date())){
+ } else if (appUser.getVipEndTime().before(new Date())) {
res.setIsVip(0);
- }else{
+ } else {
res.setIsVip(1);
}
appUserService.updateById(appUser);
@@ -539,6 +541,7 @@
// e.printStackTrace();
// }
// }
+
/**
* 购买年度会员支付微信回调
*
@@ -613,6 +616,7 @@
return null;
}
}
+
/**
* 根据用户id获取用户信息
*
@@ -621,12 +625,10 @@
*/
@ResponseBody
@PostMapping("/base/appUser/queryAppUserBatch")
- List<TAppUser> queryAppUserBatch(@RequestBody List<Integer> appUserIdList){
+ List<TAppUser> queryAppUserBatch(@RequestBody List<Integer> appUserIdList) {
return appUserService.listByIds(appUserIdList);
}
- @Autowired
- private UserIntegralChangesService userIntegralChangesService;
/**
* 修改用户信息
@@ -639,7 +641,7 @@
try {
TAppUser appUser1 = appUserService.getById(appUser.getId());
appUserService.updateById(appUser);
- if(appUser.getIntegral().compareTo(appUser1.getIntegral()) != 0){
+ if (appUser.getIntegral().compareTo(appUser1.getIntegral()) != 0) {
UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
userIntegralChanges.setAppUserId(appUser.getId());
userIntegralChanges.setOldIntegral(appUser1.getIntegral());
@@ -685,6 +687,32 @@
}
}
+ @PostMapping("/base/appUser/updateIntegral")
+ public Boolean updateIntegral(@RequestBody UpdateIntegral updateIntegral) {
+ TAppUser appUser = appUserService.getById(updateIntegral.getId());
+ Integer integral = appUser.getIntegral();
+ switch (updateIntegral.getChangeType()) {
+ case 1:
+ integral = integral + updateIntegral.getIntegral();
+ break;
+ case 2:
+ integral = integral - updateIntegral.getIntegral();
+ break;
+ }
+ appUser.setIntegral(integral);
+ appUserService.updateById(appUser);
+ UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
+ userIntegralChanges.setAppUserId(updateIntegral.getId());
+ userIntegralChanges.setType(1);
+ userIntegralChanges.setOldIntegral(appUser.getIntegral());
+ userIntegralChanges.setNewIntegral(integral);
+ userIntegralChanges.setRemark(updateIntegral.getRemark());
+ userIntegralChanges.setInsertTime(new Date());
+ userIntegralChanges.setCategory(updateIntegral.getChangeType());
+ userIntegralChangesService.save(userIntegralChanges);
+ return true;
+ }
+
@PostMapping("/base/appUser/queryById")
public TAppUser queryById(@RequestBody Integer appUserId) {
try {
@@ -724,7 +752,7 @@
@PostMapping("/appUser/queryAppUserByCityCode")
- public List<TAppUser> queryAppUserByCityCode(@RequestBody String cityCode){
+ public List<TAppUser> queryAppUserByCityCode(@RequestBody String cityCode) {
return appUserService.list(new QueryWrapper<TAppUser>()
.eq("state", 1)
.eq("cityCode", cityCode)
@@ -732,14 +760,14 @@
}
-
/**
* 根据城市code获取用户的id集合
+ *
* @param cityCode 城市code
* @return
*/
@GetMapping("/appUser/getAppUserIds/{cityCode}")
- public List<Integer> getAppUserIds(@PathVariable("cityCode") String cityCode){
+ public List<Integer> getAppUserIds(@PathVariable("cityCode") String cityCode) {
List<TAppUser> list = appUserService.list(new QueryWrapper<TAppUser>().eq("cityCode", cityCode).eq("state", 1));
return list.stream().map(TAppUser::getId).collect(Collectors.toList());
}
@@ -747,16 +775,17 @@
/**
* 根据省市名称所有用户
+ *
* @param appUserIdsByCityName
* @return
*/
@PostMapping("/appUser/getAppUserIdsByCityName")
- public List<Integer> getAppUserIdsByCityName(@RequestBody AppUserIdsByCityName appUserIdsByCityName){
+ public List<Integer> getAppUserIdsByCityName(@RequestBody AppUserIdsByCityName appUserIdsByCityName) {
QueryWrapper<TAppUser> queryWrapper = new QueryWrapper<TAppUser>().eq("state", 1);
- if(ToolUtil.isNotEmpty(appUserIdsByCityName.getProvince())){
+ if (ToolUtil.isNotEmpty(appUserIdsByCityName.getProvince())) {
queryWrapper.like("province", appUserIdsByCityName.getProvince());
}
- if(ToolUtil.isNotEmpty(appUserIdsByCityName.getCity())){
+ if (ToolUtil.isNotEmpty(appUserIdsByCityName.getCity())) {
queryWrapper.like("city", appUserIdsByCityName.getCity());
}
List<TAppUser> list = appUserService.list(queryWrapper);
@@ -766,18 +795,18 @@
@PostMapping("/appUser/queryAppUserByIds")
@ResponseBody
- public List<TStudent> queryAppUserByIds(@RequestBody UserDetailsOfSearch search){
+ public List<TStudent> queryAppUserByIds(@RequestBody UserDetailsOfSearch search) {
LambdaQueryWrapper<TStudent> tAppUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(ToolUtil.isNotEmpty(search.getIdCard())){
+ if (ToolUtil.isNotEmpty(search.getIdCard())) {
tAppUserLambdaQueryWrapper.eq(TStudent::getIdCard, search.getIdCard());
}
- if(ToolUtil.isNotEmpty(search.getPhone())){
+ if (ToolUtil.isNotEmpty(search.getPhone())) {
tAppUserLambdaQueryWrapper.eq(TStudent::getPhone, search.getPhone());
}
- if(ToolUtil.isNotEmpty(search.getName())){
+ if (ToolUtil.isNotEmpty(search.getName())) {
tAppUserLambdaQueryWrapper.eq(TStudent::getName, search.getName());
}
- tAppUserLambdaQueryWrapper.in(TStudent::getId,search.getUseIds());
+ tAppUserLambdaQueryWrapper.in(TStudent::getId, search.getUseIds());
return studentService.list(tAppUserLambdaQueryWrapper);
}
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/dto/UpdateIntegral.java b/cloud-server-account/src/main/java/com/dsh/account/dto/UpdateIntegral.java
new file mode 100644
index 0000000..74eed6e
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/dto/UpdateIntegral.java
@@ -0,0 +1,17 @@
+package com.dsh.account.dto;
+
+import lombok.Data;
+
+@Data
+// 修改用户积分明细DTO
+public class UpdateIntegral {
+ // 用户id
+ Integer id;
+ // 变动类型 1增加 2减少
+ Integer changeType;
+ // 变动积分
+ Integer integral;
+ // 备注
+ String remark;
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index c4ec3c3..22829e9 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -432,7 +432,7 @@
}else{
huiminCardVO1.setStudentName("");
- String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+ String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
huiminCardVO1.setQrCode(temp);
}
huiminCardVOS.add(huiminCardVO1);
@@ -727,7 +727,7 @@
huiminCardStudentVO.setQrCode(temp);
}else{
huiminCardStudentVO.setStudentName("");
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
huiminCardStudentVO.setQrCode(temp);
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
index 71449e7..bf8431e 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -619,6 +619,8 @@
if(null == uid){
return ResultUtil.success();
}
+ System.err.println("11111"+entrantRank);
+
entrantRank.setAppUserId(uid);
EntrantRankVo entrantRank1 = worldCupCompetitorService.getEntrantRank(entrantRank);
return ResultUtil.success(entrantRank1);
@@ -719,8 +721,11 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ System.err.println("22222"+worldCupRank);
+
worldCupRank.setAppUserId(uid);
List<WorldCupRankVo> worldCupRank1 = worldCupCompetitorService.getWorldCupRank(worldCupRank);
+ System.err.println("排名数据"+worldCupRank1);
return ResultUtil.success(worldCupRank1);
}catch (Exception e){
e.printStackTrace();
@@ -736,6 +741,7 @@
})
public ResultUtil<List<WorldCupListVo>> getWorldCupListFromRank(MyWorldCupList myWorldCupList){
try {
+ System.err.println("33333"+myWorldCupList);
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
return ResultUtil.tokenErr();
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
index d2e1d63..df83a2d 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java
@@ -346,6 +346,7 @@
worldCupRankVo.setRank(a);
a++;
}
+
return list;
}
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
index 9b3b0a8..55aab09 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupPaymentParticipantServiceImpl.java
@@ -249,6 +249,9 @@
//学员
if(1 == participantType && !xy.contains(participantId)){
TStudent tStudent = studentClient.queryById(participantId.intValue());
+ if (tStudent.getState()!=1){
+ continue;
+ }
participantVo.setId(tStudent.getId());
participantVo.setName(tStudent.getName());
participantVo.setAvatar(tStudent.getHeadImg());
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
index e013170..b0bf114 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
@@ -86,6 +86,7 @@
if (null == uid) {
return ResultUtil.tokenErr();
}
+ System.err.println("查询人员列表");
List<ParticipantVo> participantVos = participantService.queryParticipantList(uid);
// if (isPre != null) {
List<ParticipantVo> filteredParticipants = new ArrayList<>();
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
index ec41010..b7d2aae 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
@@ -11,6 +11,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.model.dto.GiftSearchDto;
import com.dsh.guns.modular.system.model.dto.SelectDto;
+import com.dsh.guns.modular.system.model.dto.UpdateIntegral;
import com.dsh.guns.modular.system.util.ResultUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -157,4 +158,7 @@
void comdel(@RequestBody Integer id);
@PostMapping("/student/updatePassWord")
void updatePassWord(@RequestBody List<String> strings);
+ @RequestMapping("/base/appUser/updateIntegral")
+ Boolean updateIntegral(@RequestBody UpdateIntegral updateIntegral);
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
index fa40e6e..a456f51 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java
@@ -25,8 +25,10 @@
import com.dsh.guns.config.UserExt;
import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.model.*;
+import com.dsh.guns.modular.system.model.dto.UpdateIntegral;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
+import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -168,9 +170,26 @@
model.addAttribute("students",tStudents);
return PREFIX + "TAppUser_edit.html";
}
+ @RequestMapping("/changeIntegral/{id}")
+ public String changeIntegral(Model model,@PathVariable("id") Integer id) {
+ TAppUser data = appUserClient.queryById(id);
+ model.addAttribute("data",data);
+ return PREFIX + "TAppUser_changeIntegral.html";
+ }
@Autowired
private WorldCupClient worldCupClient;
+ @RequestMapping("/updateIntegral")
+ @ResponseBody
+ public ResultUtil updateIntegral(Integer id,Integer changeType, Integer integral, String remark){
+ UpdateIntegral updateIntegral = new UpdateIntegral();
+ updateIntegral.setId(id);
+ updateIntegral.setChangeType(changeType);
+ updateIntegral.setIntegral(integral);
+ updateIntegral.setRemark(remark);
+ System.err.println("积分修改是否成功:"+appUserClient.updateIntegral(updateIntegral));
+ return ResultUtil.success();
+ }
/**
* 获取所有用户信息
* @return
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/UpdateIntegral.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/UpdateIntegral.java
new file mode 100644
index 0000000..ec127ce
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/UpdateIntegral.java
@@ -0,0 +1,19 @@
+package com.dsh.guns.modular.system.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+// 修改用户积分明细DTO
+public class UpdateIntegral {
+ // 用户id
+ Integer id;
+ // 变动类型 1增加 2减少
+ Integer changeType;
+ // 变动积分
+ Integer integral;
+ // 备注
+ String remark;
+
+}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
index 889b7d5..ed01d7a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser.html
@@ -100,6 +100,7 @@
<#button name="解冻" icon="fa-check" clickFun="TQuestion.onShelf()" space="true"/>
<#button name="添加学员" icon="fa-edit" clickFun="TQuestion.openAddStudent()" space="true"/>
<#button name="查看学员信息" icon="fa-edit" clickFun="TQuestion.openChange()" space="true"/>
+ <#button name="修改积分" icon="fa-edit" clickFun="TQuestion.changeIntegral()" space="true"/>
</div>
<#table id="TQuestionTable"/>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_changeIntegral.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_changeIntegral.html
new file mode 100644
index 0000000..d592a7a
--- /dev/null
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/appUser/TAppUser_changeIntegral.html
@@ -0,0 +1,90 @@
+@layout("/common/_container.html"){
+<style>
+ .avatar-uploader .el-upload {
+ border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ height: 100px;
+ width: 100px;
+ overflow: hidden;
+ }
+
+ .avatar-uploader .el-upload:hover {
+ border-color: #409EFF;
+ }
+ .avatar-uploader-icon {
+ font-size: 28px;
+ color: #8c939d;
+ width: 100px;
+ height: 100px;
+ line-height: 100px;
+ margin-top: 32px;
+ text-align: center;
+ }
+ .avatar {
+ width: 100px;
+ height: 100px;
+ display: block;
+ }
+
+ .col-sm-12 {
+ margin-top: 20px;
+ }
+
+ .col-sm-12 select {
+ height: 33px;
+ }
+</style>
+<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.15&key=77b37f0753049c4e712ea79a24e0719c"></script>
+<div class="ibox float-e-margins">
+ <input hidden id="id" value="${data.id}">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carInfoForm">
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*当前积分数量：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" value="${data.integral}" readonly type="text">
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*变动类型：</label>
+ <div class="col-sm-9">
+ <select style="width: 300px" class="form-control" id="changeType" name = "changeType">
+ <option value="" style="color: #b6b6b6" disabled selected>请选择变动类型</option>
+ <option value="1" >增加</option>
+ <option value="2" >减少</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">*变动积分数：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" id="integral" placeholder="请输入变动积分数" type="number">
+ </div>
+ </div>
+ <div class="form-group" >
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9" style="display: flex;">
+ <input style="width: 300px" class="form-control" id="remark" placeholder="请输入备注" type="text">
+ </div>
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5" >
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TQuestion.updateIntegral()"/>
+ <#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="TQuestion.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+</div>
+
+<script src="${ctxPath}/modular/system/appUser/tAppUser.js"></script>
+<script src="${ctxPath}/js/vue/vue.js"></script>
+<script src="${ctxPath}/js/elementui/index.js"></script>
+<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
+
+@}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
index b89d9de..edf6462 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/appUser/tAppUser.js
@@ -106,6 +106,25 @@
}
}
};
+TQuestion.changeIntegral = function () {
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ if(selected.length >1 ){
+ Feng.info("只能选择一个用户进行修改！");
+ }else {
+ if (this.check()){
+ var selected = $('#' + this.id).bootstrapTable('getSelections');
+ var index = layer.open({
+ type: 2,
+ title: '修改积分',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUser/changeIntegral/' + TQuestion.seItem.id
+ });
+ this.layerIndex = index;
+ }
+ }
+};
/**
* 查看详情
@@ -380,6 +399,32 @@
});
};
+TQuestion.updateIntegral = function(){
+
+ if ( $("#changeType").val()==null ||$("#changeType").val()==""){
+ Feng.info("请选择变动类型")
+ return;
+ }
+ if ( $("#integral").val()==null ||$("#integral").val()==""){
+ Feng.info("请输入变动积分数")
+ return;
+ }
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/appUser/updateIntegral", function(data){
+ Feng.success("添加成功!")
+ TQuestion.close();
+
+ },function(data){
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("changeType",$("#changeType").val());
+ ajax.set("integral",$("#integral").val());
+ ajax.set("remark",$("#remark").val());
+ ajax.set("id",$("#id").val());
+ ajax.start();
+
+};
TQuestion.addStudentSubmit = function(){
var data = {
appUserId:null,
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 d4b96a1..cfe7a29 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
@@ -112,9 +112,7 @@
if(data!=null){
let htmlStr = '';
if (data.length>0){
- if (data.length==0){
- return
- }
+
for (let i = 0; i < data.length; i++) {
htmlStr += '<option value="' + data[i] + '">' + data[i] + '</option>'
}
@@ -123,7 +121,7 @@
}else {
- $("#nextSite1").hidden()
+ $("#nextSite1").hide()
$("#nextSite").empty()
}
}
--
Gitblit v1.7.1