From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 117 insertions(+), 32 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 394ecf6..5a7cf37 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,12 +199,13 @@
}
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())) {
// 闅忔満濂栧姳鍒�
- if (percent == null || percent.compareTo(new BigDecimal(0)) > 0) {
+ if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {
randomRewardCoupon(1, uid, source);
return;
} else {
@@ -228,9 +229,16 @@
stateActivated = 0;
}
+ Integer expiryDay = null;
+ if (stateActivated == 0)
+ expiryDay = coupon.getActivateDay();
+
+ if (expiryDay == null || expiryDay == 0)
+ expiryDay = coupon.getExpiryDay();
+
// 缁撴潫鏃ユ湡
// 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
- String endDay = DateUtil.plusDay(coupon.getExpiryDay() - 1, new Date());
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
@@ -476,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;
@@ -497,7 +510,6 @@
differentDays = 0;
}
}
-
userCouponVO.setCouponTerm(couponTerm);
// 鍓╀綑澶╂暟
@@ -510,12 +522,9 @@
userCouponVO.setState(0);
userCouponVO.setCouponEffect("寰呮縺娲�");
userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
remainDaysFontColor = "#CCCCCC";
-
} else {
userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
remainDaysFontColor = "#F14242";
}
@@ -526,6 +535,7 @@
return listVO;
}
+
/**
* 鏄惁瀛樺湪濂栧姳鍒�
*
@@ -593,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) {
@@ -612,7 +621,6 @@
map.put("fontColor", "#CCCCCC");
}
userCouponVO.setRemainDays(map);
-
}
}
}
@@ -660,7 +668,8 @@
}
if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
- && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon
+ && baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
}
@@ -1200,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);
}
}
@@ -1347,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);
}
}
}
@@ -1662,9 +1675,18 @@
} else if (couponType == CouponTypeEnum.welfareFreeCoupon.name() && threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {
stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲�
}
-
+
+
+ Integer expiryDay = null;
+ if (stateActivated == 0)
+ expiryDay = coupon.getActivateDay();
+
+ if (expiryDay == null || expiryDay == 0)
+ expiryDay = coupon.getExpiryDay();
+
+
// 璁＄畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶�
- String endDay = DateUtil.plusDay(coupon.getExpiryDay() - 1, new Date());
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
@@ -1713,7 +1735,12 @@
continue; // 鍒镐俊鎭笉瀹屾暣
}
- userCouponVO.setSource("鏉ユ簮锛�" + userCouponVO.getSource());
+ 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());
@@ -1791,6 +1818,8 @@
give = false;
}
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+
if (UserSystemCoupon.STATE_CAN_USE == state) {
Map<String, Object> jumpLink = new HashMap<String, Object>();
if (CouponTypeEnum.freeCouponGive == type) {
@@ -1815,20 +1844,24 @@
userCouponVO.setCouponEffect("璧犻�佷腑");
userCouponVO.setCouponRule(systemCoupon.getRemark());
String tips = null;
+
+ TokenTypeEnum tokenType = null;
if (CouponTypeEnum.freeCouponGive == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
tips = configService.get("give_free_coupon_tips");
+ tokenType = TokenTypeEnum.freeCoupon;
}
if (CouponTypeEnum.rebatePercentCoupon == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
tips = configService.get("give_free_coupon_tips");
+ tokenType = TokenTypeEnum.rebatePercentCoupon;
}
- if (!StringUtil.isNullOrEmpty(tips)) {
+ if (!StringUtil.isNullOrEmpty(tips) && tokenType != null) {
UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, userCouponVO.getId());
if (record != null) {
- TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(CouponTypeEnum.freeCoupon.name(), record.getId().toString());
+ TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenType.name(), record.getId().toString());
if (tokenRecord != null && !StringUtil.isNullOrEmpty(tokenRecord.getToken())) {
String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
while(tips.contains("{APP鍚嶇О}")) {
@@ -1847,18 +1880,46 @@
}
}
}
+ } else if (UserSystemCoupon.STATE_END_USE == state) {
- } else if (give && UserSystemCoupon.STATE_END_USE == state) {
- userCouponVO.setCouponRule(systemCoupon.getRemark());
- if (CouponTypeEnum.freeCouponGive == type) {
- userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+ if (give) {
+ userCouponVO.setCouponEffect("浠绘��0鍏冭喘");
+ 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);
+ }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", "#CCCCCC");
+ userCouponVO.setRemainDays(remainDays);
}
- }else if (give && UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponRule(systemCoupon.getRemark());
+
+ if(give)
+ userCouponVO.setCouponRule(systemCoupon.getRemark());
}
userCouponVO.setJumpBtn(jumpBtn);
}
@@ -1994,11 +2055,7 @@
userCouponVO.setCouponTerm(couponTerm);
Map<String, Object> remainDays = new HashMap<String, Object>();
-
- try {
- remainDays.put("content", "鍓╀綑" + DateUtil.dateDiff2(new Date(), record.getGiveTime()) + "杩囨湡");
- } catch (Exception e) {
- }
+ remainDays.put("content", "鍓╀綑23鏃�59鍒嗚繃鏈�");
remainDays.put("fontColor", "#F14242");
userCouponVO.setRemainDays(remainDays);
@@ -2065,17 +2122,45 @@
if (systemCoupon == null)
continue;
+ String couponName = systemCoupon.getName();
+ if (CouponTypeEnum.freeCouponGive == systemCoupon.getType())
+ couponName = "鍏嶅崟鍒�";
+
// 閫�鍥炴秷鎭�
String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績鏌ョ湅";
SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();
msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);
- msgOther.setTitle("璧犻��" + systemCoupon.getName() + "閫�鍥�");
- msgOther.setGiveType("浣犺禒閫佺殑"+ systemCoupon.getName() + "鏈鎴愬姛棰嗗彇");
+ msgOther.setTitle("璧犻��" + couponName + "閫�鍥�");
+ msgOther.setGiveType("浣犺禒閫佺殑"+ couponName + "鏈鎴愬姛棰嗗彇");
msgOther.setGiveTime(sd.format(record.getGiveTime()));
msgOther.setReturnTime(sd.format(new Date()));
userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);
}
}
+
+
+ @Override
+ public boolean getIncludeExchange(Long uid) {
+ List<String> list = new ArrayList<String>();
+ list.add(UserSystemCoupon.SOURCE_EXCHANGE);
+ list.add(UserSystemCoupon.SOURCE_GIVE);
+ List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, list);
+ if (listCoupon == null || listCoupon.size() == 0)
+ return false;
+ return true;
+ }
+
+
+ @Override
+ public boolean getIncludeNotExchange(Long uid) {
+ List<String> list = new ArrayList<String>();
+ list.add(UserSystemCoupon.SOURCE_EXCHANGE);
+ list.add(UserSystemCoupon.SOURCE_GIVE);
+ List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, list);
+ if (listCoupon == null || listCoupon.size() == 0)
+ return false;
+ return true;
+ }
}
--
Gitblit v1.8.0