From ee56fd24c90d401ebce41ee4c0f7c9f5a1664bf9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:21 +0800
Subject: [PATCH] 用户活跃AOP加入
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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 616bd92..8f11e8e 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
@@ -199,7 +199,8 @@
}
SystemCoupon coupon = null;
- if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())) {
+ if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())
+ | couponType.equals(CouponTypeEnum.freeCouponBuy.name())) {
// 鍏嶅崟鍒�
coupon = systemCouponService.getCouponByType(couponType);
} else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
@@ -483,11 +484,16 @@
}
String source = userCouponVO.getSource();
+ if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
+ source = "澶╁ぉ鎶�";
+ }
+
userCouponVO.setSource("鏉ユ簮锛�" + source);
-
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
+ userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
+ userCouponVO.setCouponPicture(systemCoupon.getPicture());
userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
int differentDays = 0;
@@ -504,7 +510,6 @@
differentDays = 0;
}
}
-
userCouponVO.setCouponTerm(couponTerm);
// 鍓╀綑澶╂暟
@@ -517,12 +522,9 @@
userCouponVO.setState(0);
userCouponVO.setCouponEffect("寰呮縺娲�");
userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
remainDaysFontColor = "#CCCCCC";
-
} else {
userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
remainDaysFontColor = "#F14242";
}
@@ -533,6 +535,7 @@
return listVO;
}
+
/**
* 鏄惁瀛樺湪濂栧姳鍒�
*
@@ -600,12 +603,11 @@
}
List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
-
+
// 鑾峰彇鍟嗗搧璇︽儏
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
if (taoBaoGoodsBrief != null) {
BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
-
// 鍒稿悗浠� 澶т簬10鍏� 涓嶈兘鍏嶅崟
if (quanPrice.compareTo(new BigDecimal(10)) > 0) {
if (list != null && list.size() > 0) {
@@ -619,7 +621,6 @@
map.put("fontColor", "#CCCCCC");
}
userCouponVO.setRemainDays(map);
-
}
}
}
@@ -667,7 +668,8 @@
}
if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
- && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon
+ && baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
}
@@ -1207,6 +1209,8 @@
userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);
} else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);
+ } else if (CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.couponUsedFreeSheet(record.getUserSystemCoupon(), orderNo, MsgTypeOtherTypeEnum.freeCouponBuy);
}
}
@@ -1354,6 +1358,8 @@
userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon, orderNo, payment);
} else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
+ } else if (CouponTypeEnum.freeCouponBuy.name().equals(couponType)) {
+ userOtherMsgNotificationService.couponUsingFreeSheet(userSystemCoupon, orderNo, payment, MsgTypeOtherTypeEnum.freeCouponBuy);
}
}
}
@@ -1877,6 +1883,7 @@
} else if (UserSystemCoupon.STATE_END_USE == state) {
if (give) {
+ userCouponVO.setCouponEffect("浠绘��0鍏冭喘");
userCouponVO.setCouponRule(systemCoupon.getRemark());
if (CouponTypeEnum.freeCouponGive == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
@@ -2127,5 +2134,19 @@
userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);
}
}
+
+
+// @Override
+// public boolean countIncludeExchange(Long uid) {
+//
+//
+// }
+//
+//
+// @Override
+// public boolean countNotIncludeExchange(Long uid) {
+//
+//
+// }
}
--
Gitblit v1.8.0