From f92377709d27a03726001e8fb1de51512c43d5e2 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 28 二月 2019 14:48:33 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 65905f6..05dce2a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -424,14 +424,6 @@
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
- Integer stateActivated = userCouponVO.getStateActivated();
- if (stateActivated == null || stateActivated == 0) {
- userCouponVO.setState(0);
- userCouponVO.setCouponEffect("寰呮縺娲�");
- userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
- } else {
- userCouponVO.setCouponPicture(systemCoupon.getPicture());
- }
int differentDays = 0;
String couponTerm = "鏈夋晥鏈燂細";
@@ -453,7 +445,23 @@
// 鍓╀綑澶╂暟
Map<String, Object> remainDays = new HashMap<String, Object>();
remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
- remainDays.put("fontColor", "#F14242");
+ String remainDaysFontColor = "";
+
+ Integer stateActivated = userCouponVO.getStateActivated();
+ if (stateActivated == null || stateActivated == 0) {
+ userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+ userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
+
+ remainDaysFontColor = "#CCCCCC";
+
+ } else {
+ userCouponVO.setCouponPicture(systemCoupon.getPicture());
+
+ remainDaysFontColor = "#F14242";
+ }
+
+ remainDays.put("fontColor", remainDaysFontColor);
userCouponVO.setRemainDays(remainDays);
}
@@ -542,6 +550,13 @@
// 鏄剧ず涓嶈兘浣跨敤
userCouponVO.setState(0);
userCouponVO.setCouponPicture(PIC_INVALID);
+
+ Map<String, Object> map = userCouponVO.getRemainDays();
+ if (map != null) {
+ map.put("fontColor", "#CCCCCC");
+ }
+ userCouponVO.setRemainDays(map);
+
}
}
}
--
Gitblit v1.8.0