From b87922420561a35c1e99b67fb6caf3fe30bc8ccf Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 08:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java
index 7c6107a..d4ead04 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponExamineController.java
@@ -193,12 +193,25 @@
for (String s : productImages.split(",")) {
strings.add(s);
}
-
+ model.addAttribute("integral",coupon.getIntegral());
+ model.addAttribute("cash",coupon.getCash());
model.addAttribute("img",strings);
Integer objectType = UserExt.getUser().getObjectType();
System.out.println(objectType);
model.addAttribute("item",coupon);
model.addAttribute("objectType",objectType);
+ Integer auditStatus = coupon.getAuditStatus();
+ switch (auditStatus){
+ case 1:
+ model.addAttribute("state","待审核");
+ break;
+ case 2:
+ model.addAttribute("state","已拒绝");
+ break;
+ case 3:
+ model.addAttribute("state","未通过");
+ break;
+ }
return PREFIX + "TCouponExamineInfo.html";
}
--
Gitblit v1.7.1