From 02ece4ea308a26928dea57ca68f0585fef1d2e62 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 28 二月 2019 15:48:38 +0800
Subject: [PATCH] 券消息bug调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 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..468af7c 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
@@ -215,11 +215,11 @@
// 娑堟伅鎺ㄩ��
try {
- if (coupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponGet(userCoupon);
- } else if (coupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
- } else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());
}
@@ -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);
+
}
}
}
@@ -603,9 +618,9 @@
// 娑堟伅鎺ㄩ��
try {
- if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
// userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
@@ -1114,11 +1129,11 @@
// 娑堟伅鎺ㄩ��
try {
- if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
- } else if (baseCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
}
@@ -1244,9 +1259,9 @@
if (baseCoupon == null) {
// 鍒稿凡浣跨敤
userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);
- } else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);
}
}
--
Gitblit v1.8.0