From 5d1dd587ec652848c9154985513ea07b1f0be757 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 10:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 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 9f625c4..616bd92 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
@@ -1874,28 +1874,40 @@
}
}
}
- } else if (give && UserSystemCoupon.STATE_END_USE == state) {
- userCouponVO.setCouponRule(systemCoupon.getRemark());
- if (CouponTypeEnum.freeCouponGive == type) {
- userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+ } else if (UserSystemCoupon.STATE_END_USE == state) {
+
+ if (give) {
+ userCouponVO.setCouponRule(systemCoupon.getRemark());
+ if (CouponTypeEnum.freeCouponGive == type) {
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+ }
+
+ if (CouponTypeEnum.rebatePercentCoupon == type) {
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+ }
+
+ Date useTime = userCouponVO.getUseTime();
+ if (useTime != null) {
+ Map<String, Object> remainDays = new HashMap<String, Object>();
+ remainDays.put("content", "浜�" + sdf.format(useTime) + "鎴愬姛璧犻��");
+ remainDays.put("fontColor", "#CCCCCC");
+ userCouponVO.setRemainDays(remainDays);
+ }
+ } else {
+ Date useTime = userCouponVO.getUseTime();
+ if (useTime != null) {
+ Map<String, Object> remainDays = new HashMap<String, Object>();
+ remainDays.put("content", "浜�" + sdf.format(useTime) + "鎴愬姛浣跨敤");
+ remainDays.put("fontColor", "#CCCCCC");
+ userCouponVO.setRemainDays(remainDays);
+ }
}
- if (CouponTypeEnum.rebatePercentCoupon == type) {
- userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
- }
-
- Date useTime = userCouponVO.getUseTime();
- if (useTime != null) {
- Map<String, Object> remainDays = new HashMap<String, Object>();
- remainDays.put("content", "浜�" + sdf.format(useTime) + "鎴愬姛璧犻��");
- remainDays.put("fontColor", "#999999");
- userCouponVO.setRemainDays(remainDays);
- }
}else if (UserSystemCoupon.STATE_OVERDUE == state) {
if (endTime != null) {
Map<String, Object> remainDays = new HashMap<String, Object>();
remainDays.put("content", "浜�" + sdf.format(endTime) + "杩囨湡");
- remainDays.put("fontColor", "#999999");
+ remainDays.put("fontColor", "#CCCCCC");
userCouponVO.setRemainDays(remainDays);
}
--
Gitblit v1.8.0