From fde0d8d0de95b322b9be6f01e419287ddb400868 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 21 十一月 2023 19:42:04 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
index e0d855b..bf025a0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TDiscountController.java
@@ -147,6 +147,9 @@
model.addAttribute("item", tCoursePackage);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
List<Map<String, Object>> list = new ArrayList<>();
+ // 拒绝理由
+ StringBuilder reasons = new StringBuilder("");
+ int a =0;
for (CoursePackagePaymentConfig coursePackagePaymentConfig : list4) {
if(coursePackagePaymentConfig.getCashPayment() == 0){
continue;
@@ -163,13 +166,58 @@
}
map.put("payment", payment);
map.put("cashPayment", coursePackagePaymentConfig.getCashPayment());
+
List<TCoursePackageDiscount> tCoursePackageDiscounts = coursePackageDiscountClient.queryCoursePackageDiscount(coursePackagePaymentConfig.getId());
+ for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+ if (tCoursePackageDiscount.getAuditStatus()==3){
+ a = 3;
+ model.addAttribute("type1",3);
+ break;
+ }else if (tCoursePackageDiscount.getAuditStatus()==2){
+ a=2;
+ model.addAttribute("type1",-1);
+ }else{
+ a=1;
+ model.addAttribute("type1",-1);
+ break;
+ }
+ }
+ for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
+ if (tCoursePackageDiscount.getAuditStatus()==3){
+ reasons.append(tCoursePackageDiscount.getAuditRemark()+",");
+ }
+ }
map.put("coursePackageDiscount", tCoursePackageDiscounts);
list.add(map);
}
model.addAttribute("role",UserExt.getUser().getObjectType());
- model.addAttribute("type",tCoursePackage.getType());
+ Integer type1 = tCoursePackage.getType();
+ // 审核状态
+ StringBuilder stringBuilder = new StringBuilder("");
+
+ switch (a){
+ case 1:
+ stringBuilder.append("待审核");
+ break;
+ case 2:
+ stringBuilder.append("已通过");
+ break;
+ case 3:
+ stringBuilder.append("未通过");
+ break;
+ }
+ model.addAttribute("type",stringBuilder);
+
+ String string = reasons.toString();
+ if (!string.equals("")){
+ int index = string.indexOf(",");
+ String result = string.substring(0, index);
+ model.addAttribute("reasons", result);
+ }else{
+ model.addAttribute("reasons", "");
+ }
model.addAttribute("coursePackagePaymentConfig", JSON.toJSONString(list));
+ model.addAttribute("type2",tCoursePackage.getType());
return PREFIX + "coursePackageDiscount.html";
}
@RequestMapping("/infoOne")
@@ -241,8 +289,9 @@
String string = reasons.toString();
if (!string.equals("")){
- String substring = string.substring(0, string.length() - 1);
- model.addAttribute("reasons", substring);
+ int index = string.indexOf(",");
+ String result = string.substring(0, index);
+ model.addAttribute("reasons", result);
}else{
model.addAttribute("reasons", "");
}
--
Gitblit v1.7.1