From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 423 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 288 insertions(+), 135 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 1d3dad9..169bb92 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
@@ -1,7 +1,6 @@
package com.yeshi.fanli.service.impl.user;
import java.math.BigDecimal;
-import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -17,6 +16,8 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
+import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
@@ -190,7 +191,7 @@
@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) {
@@ -198,13 +199,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) {
@@ -223,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);
@@ -292,8 +305,6 @@
return null;
}
- // 鏇存柊杩囨湡鍒�
- updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -473,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;
@@ -494,7 +510,6 @@
differentDays = 0;
}
}
-
userCouponVO.setCouponTerm(couponTerm);
// 鍓╀綑澶╂暟
@@ -507,12 +522,9 @@
userCouponVO.setState(0);
userCouponVO.setCouponEffect("寰呮縺娲�");
userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
remainDaysFontColor = "#CCCCCC";
-
} else {
userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
remainDaysFontColor = "#F14242";
}
@@ -523,6 +535,7 @@
return listVO;
}
+
/**
* 鏄惁瀛樺湪濂栧姳鍒�
*
@@ -555,8 +568,6 @@
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
- // 鏇存柊杩囨湡鍒�
- updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -582,8 +593,6 @@
throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
}
- // 鏇存柊杩囨湡鍒�
- updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -594,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) {
@@ -613,7 +621,6 @@
map.put("fontColor", "#CCCCCC");
}
userCouponVO.setRemainDays(map);
-
}
}
}
@@ -661,7 +668,8 @@
}
if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
- && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon
+ && baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
}
@@ -1120,9 +1128,6 @@
return;
}
- // 楠岃瘉鏄惁澶辨晥
- updateCounponInvalid(uid);
-
// 寰呮椿绂忓埄鍏嶅崟鍒�
List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
if (list == null || list.size() == 0) {
@@ -1204,28 +1209,35 @@
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);
}
}
- @Transactional
@Override
- public void updateCounponInvalid(Long uid) {
- List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
+ public List<UserSystemCoupon> getCounponNowInvalid(int count) {
+ return userSystemCouponMapper.getCounponNowInvalid(count);
+ }
+
+
+ @Override
+ public void updateCounponInvalid(List<UserSystemCoupon> list) {
if (list == null || list.size() == 0) {
return;
}
for (UserSystemCoupon userSystemCoupon : list) {
- // 鏇存柊鍒稿凡杩囨湡
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setUpdateTime(new Date());
userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
- SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
- if (systemCoupon == null) {
+ SystemCoupon baseCoupon = userSystemCoupon.getSystemCoupon();
+ if (baseCoupon == null) {
continue;
}
-
- SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+
+ baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
if (baseCoupon == null || baseCoupon.getId() == null) {
continue;
}
@@ -1238,8 +1250,11 @@
userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
} else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
+ }else if (baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
+ userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponBuy);
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
+ userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponGive);
}
-
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -1254,7 +1269,7 @@
@Override
public void sendBackTimeOutCoupon(Long uid) {
// 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫埜
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid,600L);
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 600L);
if (list == null || list.size() == 0) {
return;
}
@@ -1266,32 +1281,9 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
-
- int expiryDay = 15;
-
- SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
- SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
- if (coupon != null) {
- expiryDay = coupon.getExpiryDay();
- }
-
- // 缁撴潫鏃ユ湡
- Date endTime = null;
- try {
- // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
- String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- endTime = format.parse(endDay);
- } catch (ParseException e) {
- e.printStackTrace();
- }
// 鐘舵�佸垵濮嬪寲
userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
userSystemCoupon.setUseTime(null);
-
- // 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
- userSystemCoupon.setStartTime(new Date());
- userSystemCoupon.setEndTime(endTime);
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
}
@@ -1366,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);
}
}
}
@@ -1378,42 +1372,50 @@
*
* @param userSystemCoupon
*/
- public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception {
-
- int expiryDay = 15;
-
- SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
- SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
- if (coupon != null) {
- expiryDay = coupon.getExpiryDay();
+ public void sendBackCoupon(UserSystemCoupon userCoupon, UserSystemCouponRecord record) throws Exception {
+ if (userCoupon == null)
+ return;
+
+ Integer state = userCoupon.getState();
+ if (state != UserSystemCoupon.STATE_IN_USE)
+ return;
+
+ Date now = new Date();
+ Date endTime = userCoupon.getEndTime();
+ if (endTime != null && endTime.getTime() < now.getTime()) {
+ // 杩囨湡
+ List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
+ list.add(userCoupon);
+ updateCounponInvalid(list);
+ return;
}
-
- // 缁撴潫鏃ユ湡
- Date endTime = null;
- try {
- // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
- String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- endTime = format.parse(endDay);
- } catch (ParseException e) {
- e.printStackTrace();
- }
- // 鐘舵�佸垵濮嬪寲
- userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+
+ // 閫�鍥炲埜
+ UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+ userSystemCoupon.setId(userCoupon.getId());
+ userSystemCoupon.setGive(false);
userSystemCoupon.setUseTime(null);
- // 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
- userSystemCoupon.setStartTime(new Date());
- userSystemCoupon.setEndTime(endTime);
-
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
userSystemCoupon.setUpdateTime(new Date());
-
userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
-
- if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
- userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());
- } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
- userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());
+
+ // 浣跨敤璁板綍
+ if (record != null) {
+ UserSystemCouponRecord useRecordUpdate = new UserSystemCouponRecord();
+ useRecordUpdate.setId(record.getId());
+ useRecordUpdate.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+ useRecordUpdate.setUpdateTime(new Date());
+ userSystemCouponRecordService.updateByPrimaryKeySelective(useRecordUpdate);
+
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());
+ } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());
+ } else if (CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.couponDrawBack(userSystemCoupon, record.getOrderNo(), MsgTypeOtherTypeEnum.freeCouponBuy);
+ }
}
+
}
@Override
@@ -1673,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);
@@ -1699,8 +1710,6 @@
@Override
public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
- // 鏇存柊杩囨湡鍒�
- updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -1726,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());
@@ -1748,7 +1762,7 @@
userCouponVO.setCouponPicture(systemCoupon.getPicture());
}
- if (UserSystemCoupon.STATE_CAN_USE == state) {
+ if (UserSystemCoupon.STATE_CAN_USE == state || UserSystemCoupon.STATE_IN_USE == state) {
int differentDays = 0;
if (endTime != null && startTime != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1804,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) {
@@ -1826,42 +1842,84 @@
}
} 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();
+ if (endTimeGive != null) {
+ Map<String, Object> remainDays = new HashMap<String, Object>();
+ remainDays.put("content", "鍓╀綑" + DateUtil.dateDiff2(new Date(), endTimeGive) + "杩囨湡");
+ 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);
}
@@ -1871,7 +1929,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, "璇ュ埜宸蹭笉瀛樺湪");
@@ -1885,11 +1943,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 )
@@ -1921,7 +1976,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);
}
}
@@ -1970,34 +2026,131 @@
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;
}
@Override
- public void sendBackGive(Long id) {
- UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
- if (userSystemCoupon == null)
- return;
-
- Integer state = userSystemCoupon.getState();
- if (state != UserSystemCoupon.STATE_IN_USE)
- return;
-
- Date now = new Date();
- Date endTime = userSystemCoupon.getEndTime();
- if (endTime != null && endTime.getTime() < now.getTime()) {
+ public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
+ for (UserSystemCouponGiveRecord record: overdueList) {
+ // 鏇存柊璧犻�佽褰�
+ UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
+ updateRecord.setId(record.getId());
+ updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);
+ userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);
- // TODO 杩囨湡
- return;
+ // 鏇存柊鍒镐俊鎭�
+ Long couponId = record.getCouponId();
+ if (couponId == null) {
+ continue;
+ }
+
+ // 鍒稿垪琛�
+ UserSystemCoupon userCoupon = userSystemCouponMapper.selectByPrimaryKey(couponId);
+ if (userCoupon == null)
+ continue;
+
+ Integer state = userCoupon.getState();
+ if (state != UserSystemCoupon.STATE_IN_USE)
+ return;
+
+ Date now = new Date();
+ Date endTime = userCoupon.getEndTime();
+ if (endTime != null && endTime.getTime() < now.getTime()) {
+ List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
+ list.add(userCoupon);
+ updateCounponInvalid(list);
+ continue;
+ }
+
+ // 閫�鍥炲埜
+ UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+ userSystemCoupon.setId(userCoupon.getId());
+ userSystemCoupon.setGive(false);
+ userSystemCoupon.setUseTime(null);
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userSystemCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+
+ // 浣跨敤璁板綍
+ UserSystemCouponRecord useRecord = userSystemCouponRecordService.getNearByUserCouponId(couponId);
+ if (useRecord != null) {
+ UserSystemCouponRecord useRecordUpdate = new UserSystemCouponRecord();
+ useRecordUpdate.setId(useRecord.getId());
+ useRecordUpdate.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+ useRecordUpdate.setUpdateTime(new Date());
+ userSystemCouponRecordService.updateByPrimaryKeySelective(useRecordUpdate);
+ }
+
+ SystemCoupon systemCoupon = userCoupon.getSystemCoupon();
+ if (systemCoupon != null)
+ systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+
+ 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("璧犻��" + couponName + "閫�鍥�");
+ msgOther.setGiveType("浣犺禒閫佺殑"+ couponName + "鏈鎴愬姛棰嗗彇");
+ msgOther.setGiveTime(sd.format(record.getGiveTime()));
+ msgOther.setReturnTime(sd.format(new Date()));
+ userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);
}
-
- userSystemCoupon.setGive(false);
- userSystemCoupon.setUseTime(null);
- userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- userSystemCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
-
- // TODO 娑堟伅
}
+
+
+// @Override
+// public boolean countIncludeExchange(Long uid) {
+//
+//
+// }
+//
+//
+// @Override
+// public boolean countNotIncludeExchange(Long uid) {
+//
+//
+// }
+
}
--
Gitblit v1.8.0