From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 14:47:15 +0800
Subject: [PATCH] 奖励券使用区分订单下单三方日期
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 287 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 246 insertions(+), 41 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 43b17bc..43f8117 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
@@ -185,13 +185,18 @@
}
@Override
+ public long countCouponOld(Long uid) {
+ return userSystemCouponMapper.countCouponOld(uid);
+ }
+
+ @Override
public long countUserCouponList(Long uid) {
return userSystemCouponMapper.countUserCouponList(uid);
}
@Override
@Transactional
- public void insertUserCoupon(Long uid, String couponType, String source)
+ public void insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent)
throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
@@ -199,13 +204,18 @@
}
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())) {
// 闅忔満濂栧姳鍒�
- randomRewardCoupon(1, uid, source);
- return;
+ if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {
+ randomRewardCoupon(1, uid, source);
+ return;
+ } else {
+ coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
+ }
}
if (coupon == null) {
@@ -224,9 +234,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);
@@ -296,7 +313,7 @@
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
- List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
+ List<UserSystemCouponVO> listVO = userSystemCouponMapper.getCouponListOld(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
}
@@ -472,11 +489,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;
@@ -493,7 +515,6 @@
differentDays = 0;
}
}
-
userCouponVO.setCouponTerm(couponTerm);
// 鍓╀綑澶╂暟
@@ -506,12 +527,9 @@
userCouponVO.setState(0);
userCouponVO.setCouponEffect("寰呮縺娲�");
userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
remainDaysFontColor = "#CCCCCC";
-
} else {
userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
remainDaysFontColor = "#F14242";
}
@@ -522,6 +540,7 @@
return listVO;
}
+
/**
* 鏄惁瀛樺湪濂栧姳鍒�
*
@@ -589,12 +608,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) {
@@ -608,7 +626,6 @@
map.put("fontColor", "#CCCCCC");
}
userCouponVO.setRemainDays(map);
-
}
}
}
@@ -656,7 +673,8 @@
}
if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
- && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon
+ && baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
}
@@ -1196,6 +1214,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);
}
}
@@ -1343,6 +1363,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);
}
}
}
@@ -1658,9 +1680,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);
@@ -1709,7 +1740,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());
@@ -1787,6 +1823,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) {
@@ -1801,35 +1839,42 @@
// 鍙娇鐢ㄣ�� 鍙禒閫�
userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
- // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
+ // 杩斿埄濂栧姳鍒�- 璺宠浆鑷冲凡鍒拌处-宸叉敹璐�
jumpLink.put("state", "2");
+ jumpLink.put("type", "1");
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("order_screen_list"));
}
} else if (UserSystemCoupon.STATE_IN_USE == state && give) {
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鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ userCouponVO.setGiveTips(tips);
}
Date endTimeGive = record.getEndTime();
@@ -1839,19 +1884,48 @@
remainDays.put("fontColor", "#F14242");
userCouponVO.setRemainDays(remainDays);
}
+ }
+ }
+ } 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);
+ }
+
+ 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 {
- tips = "";
- }
- userCouponVO.setGiveTips(tips);
- } else if (UserSystemCoupon.STATE_END_USE == state) {
- if (give && CouponTypeEnum.freeCouponGive == 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);
+ }
}
- if (give && 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);
}
+
+ if(give)
+ userCouponVO.setCouponRule(systemCoupon.getRemark());
}
userCouponVO.setJumpBtn(jumpBtn);
}
@@ -1861,7 +1935,7 @@
@Transactional
@Override
- public String giveCoupon(Long uid, Long id) throws UserSystemCouponException {
+ public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException {
UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
if (userSystemCoupon == null)
throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
@@ -1875,11 +1949,8 @@
throw new UserSystemCouponException(1, "璇ュ埜宸插け鏁�");
Integer state = userSystemCoupon.getState();
- if (state == UserSystemCoupon.STATE_OVERDUE)
- throw new UserSystemCouponException(1, "璇ュ埜宸茶繃鏈�");
-
- if (state == UserSystemCoupon.STATE_END_USE)
- throw new UserSystemCouponException(1, "璇ュ埜浣跨敤/璧犻�佹垚鍔�");
+ if (state != UserSystemCoupon.STATE_CAN_USE)
+ throw new UserSystemCouponException(1, "璇ュ埜宸茶浣跨敤鎴栬禒閫�");
CouponTypeEnum type = systemCoupon.getType();
if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon )
@@ -1911,7 +1982,8 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
- return tips;
+
+ return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
}
}
@@ -1960,7 +2032,40 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
- return tips;
+
+ return createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
+ }
+
+
+ private UserSystemCouponVO createUserCouponVOo(UserSystemCoupon userSystemCoupon, SystemCoupon systemCoupon,
+ UserSystemCouponGiveRecord record, String tips) {
+ UserSystemCouponVO userCouponVO = new UserSystemCouponVO();
+ userCouponVO.setId(userSystemCoupon.getId());
+ userCouponVO.setUid(userSystemCoupon.getUid());
+ userCouponVO.setSource("鏉ユ簮锛�" + userSystemCoupon.getSource());
+ userCouponVO.setCouponName(systemCoupon.getName());
+ userCouponVO.setCouponEffect("璧犻�佷腑");
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
+ userCouponVO.setCouponRule(systemCoupon.getRemark());
+ userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
+ userCouponVO.setCouponPicture(systemCoupon.getPicture());
+ userCouponVO.setGiveTips(tips);
+
+ String couponTerm = "鏈夋晥鏈燂細";
+ Date startTime = userCouponVO.getStartTime();
+ Date endTime = userCouponVO.getEndTime();
+ if (endTime != null && startTime != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
+ }
+ userCouponVO.setCouponTerm(couponTerm);
+
+ Map<String, Object> remainDays = new HashMap<String, Object>();
+ remainDays.put("content", "鍓╀綑23鏃�59鍒嗚繃鏈�");
+ remainDays.put("fontColor", "#F14242");
+ userCouponVO.setRemainDays(remainDays);
+
+ return userCouponVO;
}
@@ -2023,17 +2128,117 @@
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");
+ 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) {
+ String percent = configService.get("exchange_rebate_percent");
+ if (StringUtil.isNullOrEmpty(percent))
+ percent = "35";
+ List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
+ if (listCoupon == null || listCoupon.size() == 0)
+ return false;
+ return true;
+ }
+
+
+ @Override
+ public boolean getIncludeNotExchange(Long uid) {
+ String percent = configService.get("exchange_rebate_percent");
+ if (StringUtil.isNullOrEmpty(percent))
+ percent = "35";
+ List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
+ if (listCoupon == null || listCoupon.size() == 0)
+ return false;
+ return true;
+ }
+
+ @Override
+ public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception{
+ sendBackTimeOutCoupon(uid);
+
+ String percent = configService.get("exchange_rebate_percent");
+ if (StringUtil.isNullOrEmpty(percent))
+ percent = "35";
+
+ List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
+ if (listCoupon == null || listCoupon.size() == 0)
+ return null;
+
+ for (UserSystemCouponVO userCouponVO : listCoupon) {
+ String source = userCouponVO.getSource();
+ if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
+ source = "澶╁ぉ鎶�";
+ }
+
+ SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
+ if (systemCoupon == null) {
+ continue; // 鍒镐俊鎭笉瀹屾暣
+ }
+
+ systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+
+ 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;
+ String couponTerm = "鏈夋晥鏈燂細";
+ Date startTime = userCouponVO.getStartTime();
+ Date endTime = userCouponVO.getEndTime();
+ if (endTime != null && startTime != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
+
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
+ if (differentDays < 0) {
+ differentDays = 0;
+ }
+ }
+ userCouponVO.setCouponTerm(couponTerm);
+
+ // 鍓╀綑澶╂暟
+ Map<String, Object> remainDays = new HashMap<String, Object>();
+ remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
+ String remainDaysFontColor = "";
+
+ Integer stateActivated = userCouponVO.getStateActivated();
+ if (stateActivated == null || stateActivated == 0) {
+ userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+ remainDaysFontColor = "#CCCCCC";
+ } else {
+ userCouponVO.setCouponPicture(systemCoupon.getPicture());
+ remainDaysFontColor = "#F14242";
+ }
+
+ remainDays.put("fontColor", remainDaysFontColor);
+ userCouponVO.setRemainDays(remainDays);
+ }
+
+ return listCoupon;
+ }
}
--
Gitblit v1.8.0