From c35f907f1ab5c2cd45a55bf757bb2fc17a5bcf1e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:45:54 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 21 ++++++
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java | 10 +++
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java | 18 +++++
cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js | 19 ++++--
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 4
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 10 ++-
cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/registrationRecord.html | 1
cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 6 +-
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentConfigController.java | 3
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 33 ++++++----
cloud-server-management/src/main/resources/mapper/ProblemMapper.xml | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 2
cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml | 3
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageDiscountClient.java | 6 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentConfigClient.java | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html | 8 +-
17 files changed, 107 insertions(+), 42 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
index 86b0cec..b08fed4 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -18,6 +18,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -40,7 +41,22 @@
@ResponseBody
@RequestMapping("/finance/rechargeList")
public List<RechargeRecordsVO> rechargeList(@RequestBody RechargeRecordsQuery query){
- return rechargeRecordsService.rechargeList(query);
+ List<RechargeRecordsVO> rechargeRecordsVOS = rechargeRecordsService.rechargeList(query);
+ for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
+ TAppUser byId = appUserService.getById(rechargeRecordsVO.getAppUserId());
+ if (byId==null)continue;
+ Date vipEndTime = byId.getVipEndTime();
+ if (vipEndTime==null){
+ rechargeRecordsVO.setType(2);
+ continue;
+ }
+ if (rechargeRecordsVO.getPayTime().after(vipEndTime)){
+ rechargeRecordsVO.setType(2);
+ }else{
+ rechargeRecordsVO.setType(1);
+ }
+ }
+ return rechargeRecordsVOS;
}
/**
* 数据统计-充值记录列表数据
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 908aa4b..9160687 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -283,8 +283,6 @@
System.out.println("======giftSelect=========giftSearchDto===="+giftSearchDto);
TAppUser one = appUserService.getOne(new QueryWrapper<TAppUser>().eq("name", giftSearchDto.getName())
.eq("phone", giftSearchDto.getPhone()));
-
-
// Integer appId = studentService.getGiftSelect(giftSearchDto);
TCoursePackagePayment1 coursePackagePaymentById = paymentClient.getCoursePackagePaymentById1(giftSearchDto.getId());
// System.out.println("=======giftSelect======appId====>"+appId);
@@ -298,6 +296,8 @@
selectDto.setId(student.getId());
list.add(selectDto);
}
+ // 只筛选当前用户已经购买了这个课程的学员
+
System.out.println("=======giftSelect======selectDtos====>"+list);
return list;
}
diff --git a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
index 8440f3c..331f9fd 100644
--- a/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/RechargeRecordsMapper.xml
@@ -4,7 +4,7 @@
<select id="rechargeList" resultType="com.dsh.account.model.vo.RechargeRecordsVO">
- select t1.* from t_recharge_records t1
+ select t1.*,t2.name,t2.phone,CONCAT(t2.province,t2.city)as provinceAndCity from t_recharge_records t1
left join t_app_user t2 on t1.appUserId = t2.id
<where>
<if test="query.amount!=null and query.amount!= ''">
@@ -31,6 +31,7 @@
#{id}
</foreach>
</if>
+ and t1.payStatus = 2
</where>
</select>
<select id="listAll" resultType="com.dsh.account.entity.VipPayment">
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java
index 452cd17..d78f632 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageDiscountController.java
@@ -19,6 +19,16 @@
@Autowired
private TCoursePackageDiscountService coursePackageDiscountService;
+
+ /**
+ * 编辑了课包 课时规格 重新修改折扣绑定的configId
+ */
+ @ResponseBody
+ @PostMapping("/coursePackageDiscount/update")
+ public void update(@RequestBody TCoursePackageDiscount tCoursePackageDiscount){
+ coursePackageDiscountService.updateById(tCoursePackageDiscount);
+ }
+
/**
* 获取根据课包id获取课包折扣
*/
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentConfigController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentConfigController.java
index 7e95285..afc13f7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentConfigController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentConfigController.java
@@ -35,8 +35,9 @@
*/
@ResponseBody
@PostMapping("/coursePackagePaymentConfig/addCoursePackagePaymentConfig")
- public void addCoursePackagePaymentConfig(@RequestBody CoursePackagePaymentConfig coursePackagePaymentConfig){
+ public int addCoursePackagePaymentConfig(@RequestBody CoursePackagePaymentConfig coursePackagePaymentConfig){
coursePackagePaymentConfigService.save(coursePackagePaymentConfig);
+ return coursePackagePaymentConfig.getId();
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index 856caf5..b8f931c 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -412,20 +412,22 @@
@ResponseBody
public void toClass(@RequestBody ToClassDto toClassDto) throws ParseException {
System.out.println("===========到达getSelect======="+toClassDto);
- TCoursePackagePayment orinPay = paymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("id", toClassDto.getId()));
- TCoursePackagePayment studentPay = paymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId",orinPay.getCoursePackageId()));
+ TCoursePackagePayment orinPay =
+ paymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("id", toClassDto.getId()));
+ TCoursePackagePayment studentPay = paymentService.getOne
+ (new QueryWrapper<TCoursePackagePayment>()
+ .eq("studentId", toClassDto.getToStudentId())
+ .eq("coursePackageId",orinPay.getCoursePackageId()));
if (studentPay!=null) {
System.out.println("======orinPay=====>" + orinPay);
System.out.println("======studentPay=====>" + studentPay);
Integer laveClassHours = orinPay.getLaveClassHours();
Integer totalClassHours = orinPay.getTotalClassHours();
-
orinPay.setTotalClassHours(0);
orinPay.setLaveClassHours(0);
orinPay.setStatus(1);
orinPay.setAppUserId(null);
paymentService.updateById(orinPay);
-
//删除orin的排课记录
List<CoursePackageStudent> studentCourse1 = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", orinPay.getStudentId()).eq("coursePackageId", orinPay.getCoursePackageId()));
List<Long> collect1 = studentCourse1.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList());
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
index 8d0ac16..be9a00a 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
@@ -61,7 +61,7 @@
<where>
<if test="null != tStudentId">
- py.studentId = #{tStudentId}
+ and py.studentId = #{tStudentId}
</if>
and pg.type!=3
</where>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageDiscountClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageDiscountClient.java
index e725b3a..7de760e 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageDiscountClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageDiscountClient.java
@@ -14,7 +14,11 @@
*/
@FeignClient("mb-cloud-course")
public interface CoursePackageDiscountClient {
-
+ /**
+ * 编辑了课包 课时规格 重新修改折扣绑定的configId
+ */
+ @PostMapping("/coursePackageDiscount/update")
+ void update(@RequestBody TCoursePackageDiscount tCoursePackageDiscount);
/**
* 获取根据课包id获取课包折扣
*/
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentConfigClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentConfigClient.java
index 3a42a78..8318f02 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentConfigClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentConfigClient.java
@@ -27,7 +27,7 @@
* @param coursePackagePaymentConfig
*/
@PostMapping("/coursePackagePaymentConfig/addCoursePackagePaymentConfig")
- void addCoursePackagePaymentConfig(CoursePackagePaymentConfig coursePackagePaymentConfig);
+ int addCoursePackagePaymentConfig(CoursePackagePaymentConfig coursePackagePaymentConfig);
/**
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 162d693..667a190 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
@@ -520,6 +520,8 @@
// 添加运营商商户认证
operatorUser.setAlipayProportion("未设置");
operatorUser.setWechatProportion("未设置");
+ operatorUser.setWechatAudit(0);
+ operatorUser.setAlipayAudit(0);
operatorUserService.save(operatorUser);
user.setObjectId(data.getId());
userService.updateById(user);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index be57d2c..b5f9feb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -151,7 +151,6 @@
List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
model.addAttribute("stores",operatorId);
if (UserExt.getUser().getObjectType()==2){
-
// 查询这个运营商管理的省
TOperator id = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
if (id.getType()==1){
@@ -165,8 +164,9 @@
}
model.addAttribute("operator",objectId);
}
- if (UserExt.getUser().getObjectType()==1)
- model.addAttribute("operator",0);
+ if (UserExt.getUser().getObjectType()==1) model.addAttribute("operator",0);
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ if (UserExt.getUser().getObjectType()==3) model.addAttribute("operator",byId.getOperatorId());
return PREFIX + "TCompetition_add.html";
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 455abe7..5b4453d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -193,7 +193,7 @@
model.addAttribute("userName",tAppUser.getName());
model.addAttribute("tStudentDto",tStudentDto);
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String formattedDate = dateFormat.format(new Date());
model.addAttribute("reDate", formattedDate);
@@ -518,7 +518,16 @@
@RequestMapping("/classList/{tStudentId}")
@ResponseBody
public ResultUtil listClass(@PathVariable("tStudentId") Integer tStudentId) {
+ // 需要过滤体验课
List<ClassListDto> classListDtos = courseStuddentClient.listClass(tStudentId);
+ for (ClassListDto classListDto : classListDtos) {
+ classListDto.setHasClassHours(classListDto.getTotalClassHours()-classListDto.getLaveClassHours());
+ if (classListDto.getClassType()==2){
+ classListDto.setTotalClassHours(null);
+ classListDto.setHasClassHours(null);
+ classListDto.setLaveClassHours(null);
+ }
+ }
Map<String,List<ClassListDto>> map = new HashMap<>();
map.put("items",classListDtos);
return new ResultUtil<>(0,0,null,map,null);
@@ -687,7 +696,16 @@
public ResultUtil giftSelect(GiftSearchDto giftSearchDto) {
List<SelectDto> selectDtos = appUserClient.giftSelect(giftSearchDto);
+ // 只查询当前用户下 同时也报名了该课程的学员
+ for (SelectDto selectDto : selectDtos) {
+ // 获取课包id
+ TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(giftSearchDto.getId());
+ Integer coursePackageId = tCoursePackagePayment.getCoursePackageId();
+ // 学员id 拿到学员id 判断当前学员是否报名了这门课程
+ Long id = selectDto.getId();
+ //
+ }
Map<String,List<SelectDto>> map = new HashMap<>();
map.put("options",selectDtos);
// Map<String,List<SelectDto>> map = new HashMap<>();
@@ -776,7 +794,6 @@
ToClassDto toClassDto = new ToClassDto();
toClassDto.setToStudentId(toStudentId);
toClassDto.setId(id);
-
courseStuddentClient.toClass(toClassDto);
// Map<String,List<SelectDto>> map = new HashMap<>();
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
index 655e5b8..10dfd09 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
@@ -172,6 +172,9 @@
}
coursePackageClient.updateCoursePackage(coursePackage);
coursePackagePaymentConfigClient.delCoursePackagePaymentConfig(coursePackage.getId());
+ List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient
+ .queryByCoursePackageId(coursePackage.getId());
+
JSONArray jsonArray = JSON.parseArray(coursePackagePaymentConfig);
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
@@ -185,7 +188,12 @@
coursePackagePaymentConfig1.setCashPayment(cashPayment);
coursePackagePaymentConfig1.setPlayPaiCoin(playPaiCoin);
coursePackagePaymentConfig1.setCouponIds(couponIds);
- coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1);
+ int i1 = coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1);
+
+ for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+ tCoursePackageDiscount.setCoursePackagePaymentConfigId(i1);
+ coursePackageDiscountClient.update(tCoursePackageDiscount);
+ }
}
}
@@ -541,27 +549,25 @@
@Override
public ResultUtil cancellationRecord(Long id, String cancelClasses, Integer deductClassHour) {
// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
-
- List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
List<Long> integers = new ArrayList<>();
- for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
- integers.add(coursePackageScheduling.getId());
- coursePackageScheduling.setCancelClasses(cancelClasses);
- coursePackageScheduling.setDeductClassHour(deductClassHour);
- }
-
-
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
// for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
-
// if(coursePackageScheduling.getStatus() == 1 || coursePackageScheduling.getStatus() == 4){
// return ResultUtil.error("不能添加消课凭证");
// }
// coursePackageScheduling.setCancelClasses(cancelClasses);
// coursePackageScheduling.setDeductClassHour(deductClassHour);
- coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
-
List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(integers);
for (CoursePackageStudent coursePackageStudent : coursePackageStudents) {
+ for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
+ if (coursePackageStudent.getSignInOrNot()==2){
+ break;
+ }
+ integers.add(coursePackageScheduling.getId());
+ coursePackageScheduling.setCancelClasses(cancelClasses);
+ coursePackageScheduling.setDeductClassHour(deductClassHour);
+ }
+
if(coursePackageStudent.getReservationStatus() == 0){
continue;
}
@@ -598,6 +604,7 @@
}
+ coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
// }
return ResultUtil.success();
diff --git a/cloud-server-management/src/main/resources/mapper/ProblemMapper.xml b/cloud-server-management/src/main/resources/mapper/ProblemMapper.xml
index dc00ce8..7b9bae2 100644
--- a/cloud-server-management/src/main/resources/mapper/ProblemMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/ProblemMapper.xml
@@ -12,6 +12,7 @@
<result column="handleTime" property="handleTime"/>
<result column="insertTime" property="insertTime"/>
<result column="state" property="state"/>
+
</resultMap>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/registrationRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/registrationRecord.html
index 7c08efb..6136447 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/registrationRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/registrationRecord.html
@@ -35,7 +35,6 @@
<#button name="补课" icon="fa-refresh" clickFun="RegistrationRecord.makeUpMissedLessons()" space="true"/>
<#button name="更换假期班" icon="fa-refresh" clickFun="RegistrationRecord.holiClass()" space="true"/>
<#button name="换课" icon="fa-refresh" clickFun="RegistrationRecord.transClass()" space="true"/>
-
</div>
<#table id="managerTable"/>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
index 7e8e9e5..a2fd628 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/tStudentEdit.html
@@ -985,7 +985,6 @@
"label": "已上课时数",
"name": "hasClassHours",
"id": "u:b55a5ac7f49d",
- "value": "$totalClassHours-$totalClassHours"
},
{
"type": "text",
@@ -1157,7 +1156,7 @@
},
"id": "u:fcd7f36c5f88",
"level": "link",
- "disabledOn": "this.laveClassHours === 0"
+ "disabledOn": "this.laveClassHours === 0 || this.classType===2"
},
{
"type": "button",
@@ -1358,7 +1357,7 @@
},
"id": "u:ae1e6e73beb9",
"level": "link",
- "disabledOn": "this.laveClassHours === 0"
+ "disabledOn": "this.laveClassHours === 0 || this.classType===2"
},
{
"type": "button",
@@ -1604,7 +1603,8 @@
}
},
"id": "u:dd3110deaf9d",
- "level": "link"
+ "level": "link",
+ "disabledOn": "this.classType===2"
}
]
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
index 147586b..196f8fc 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/yuyue.js
@@ -33,15 +33,20 @@
if (row.status === 0 ) {
if (value) {
var moneyValues = value.split(',');
- var moneyText = moneyValues[0] + '元/' + moneyValues[1] + '玩湃币';
- return moneyText;}
- }
- else {
- if (row.payType === 4){
+ var moneyText = moneyValues[0] + '元/' + moneyValues[1] + '币';
+ return moneyText;}
+ } else {
+ console.log("看看支付方式")
+ console.log(row.payType)
+ if (row.payType == "手动支付"){
+ console.log("元")
return row.payMoney+'元'
- }else if (row.payType === 3){
- return row.payMoney+'玩湃币' }else {
+ }else if (row.payType == "玩湃币"){
+ console.log("币")
+ return row.payMoney+'币' }
+ else {
+ console.log("不会吧")
return row.payMoney+'元'
}
--
Gitblit v1.7.1