From 0b177e19cfc810ca12195c0b4e2d934566afb6b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 九月 2019 15:10:03 +0800
Subject: [PATCH] 限时秒杀bug修改，淘宝成功订单状态处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 602 +++++++++++++++++++++++++++--------------------------
1 files changed, 307 insertions(+), 295 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 acd520b..ab7f52a 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
@@ -20,6 +20,7 @@
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
+import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
@@ -66,6 +67,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TokenUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.factory.msg.MsgOtherSystemGiveDTOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -88,7 +90,7 @@
@Resource
private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
-
+
@Resource
private ConfigService configService;
@@ -137,18 +139,17 @@
@Resource
private CommonOrderCountService commonOrderCountService;
-
+
@Resource
@Lazy
private PushCouponService pushCouponService;
-
+
@Resource
private PushCouponRecordService pushCouponRecordService;
-
+
@Resource
private TokenRecordService tokenRecordService;
-
-
+
@Override
public int insertSelective(UserSystemCoupon record) {
return userSystemCouponMapper.insertSelective(record);
@@ -178,17 +179,17 @@
public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) {
return userSystemCouponMapper.getUserCouponBySource(uid, source);
}
-
+
@Override
public int countTodatyUserCouponBySource(Long uid, String source) {
return userSystemCouponMapper.countTodatyUserCouponBySource(uid, source);
}
-
+
@Override
public long countCouponOld(Long uid) {
return userSystemCouponMapper.countCouponOld(uid);
}
-
+
@Override
public long countUserCouponList(Long uid) {
return userSystemCouponMapper.countUserCouponList(uid);
@@ -196,16 +197,17 @@
@Override
@Transactional
- public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent)
- throws UserSystemCouponException, Exception {
+ public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,
+ Boolean needNotify) throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
SystemCoupon coupon = null;
- if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())
- | couponType.equals(CouponTypeEnum.freeCouponBuy.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())) {
@@ -213,11 +215,11 @@
if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {
randomRewardCoupon(1, uid, source);
return null;
- } else {
+ } else {
coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
}
}
-
+
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
@@ -235,14 +237,14 @@
}
Integer expiryDay = null;
- if (stateActivated == 0)
+ if (stateActivated == 0)
expiryDay = coupon.getActivateDay();
-
- if (expiryDay == null || expiryDay == 0)
+
+ if (expiryDay == null || expiryDay == 0)
expiryDay = coupon.getExpiryDay();
-
+
// 缁撴潫鏃ユ湡
- // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (endDay != null && endDay.trim().length() > 0) {
@@ -286,23 +288,25 @@
});
// 娑堟伅鎺ㄩ��
- try {
- if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponGet(userCoupon);
- } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
- } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
- userOtherMsgNotificationService.rewardCouponGet(userCoupon, coupon.getPercent().intValue());
- }
-
- } catch (Exception e) {
+ if (needNotify) {
try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
+ if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ userOtherMsgNotificationService.welfareCouponGet(userCoupon);
+ } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
+ userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
+ } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon, coupon.getPercent().intValue());
+ }
+
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}
-
+
return userCoupon;
}
@@ -317,10 +321,10 @@
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getCouponListOld(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
@@ -344,7 +348,7 @@
if (userInfoExtra != null) {
inviteCode = userInfoExtra.getInviteCode();
}
-
+
for (UserSystemCouponVO userCouponVO : listVO) {
SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
@@ -386,7 +390,7 @@
}
jumpBtn = new HashMap<String, Object>();
-
+
// 绂忓埄鍒搁渶瑕佹縺娲荤晫闈�
if (!changeJump) {
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
@@ -399,7 +403,7 @@
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
}
}
-
+
} else if (stateActivated == 1) {
// 鏄剧ず瑙勫垯
userCouponVO.setCouponRule(systemCoupon.getRule());
@@ -500,7 +504,7 @@
if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
source = "澶╁ぉ鎶�";
}
-
+
userCouponVO.setSource("鏉ユ簮锛�" + source);
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
@@ -548,7 +552,6 @@
return listVO;
}
-
/**
* 鏄惁瀛樺湪濂栧姳鍒�
*
@@ -576,14 +579,14 @@
@Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
-
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -611,10 +614,10 @@
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
if (couponList == null || couponList.size() == 0) {
@@ -622,7 +625,7 @@
}
List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
-
+
// 鑾峰彇鍟嗗搧璇︽儏
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
if (taoBaoGoodsBrief != null) {
@@ -647,47 +650,45 @@
return list;
}
-
@Override
- public long countUsableFreeCouponForBuy (Long uid) {
- if (uid == null)
+ public long countUsableFreeCouponForBuy(Long uid) {
+ if (uid == null)
return 0;
-
+
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
if (couponList == null || couponList.size() == 0)
return 0;
-
+
List<Long> listCouponId = new ArrayList<Long>();
for (SystemCoupon systemCoupon : couponList) {
listCouponId.add(systemCoupon.getId());
}
-
+
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
-
-
+
@Override
- public long countUsableRewardCoupon (Long uid) {
- if (uid == null)
+ public long countUsableRewardCoupon(Long uid) {
+ if (uid == null)
return 0;
-
+
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
if (couponList == null || couponList.size() == 0)
return 0;
-
+
List<Long> listCouponId = new ArrayList<Long>();
for (SystemCoupon systemCoupon : couponList) {
listCouponId.add(systemCoupon.getId());
}
-
+
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
-
-
+
@Transactional
@Override
- public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception {
+ public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType)
+ throws UserSystemCouponException, Exception {
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
@@ -700,7 +701,7 @@
if (userSystemCoupon == null) {
throw new UserSystemCouponException(1, "鍒告暟鎹笉姝ｇ‘");
}
-
+
if (userSystemCoupon.getUid().longValue() != uid) {
throw new UserSystemCouponException(1, "涓嶅睘浜庤鐢ㄦ埛鐨勫埜");
}
@@ -763,16 +764,17 @@
@Transactional
@Override
- public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) throws UserSystemCouponException, Exception {
+ public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType)
+ throws UserSystemCouponException, Exception {
if (id == null) {
throw new UserSystemCouponException(1, "鍒竔d涓嶅瓨鍦�");
}
-
+
if (sourceType == null) {
sourceType = Constant.SOURCE_TYPE_TAOBAO;
}
-
+
// 鐢ㄦ埛鍒�
UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id);
if (userSystemCoupon == null) {
@@ -807,7 +809,8 @@
}
// 璁㈠崟
- CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS, sourceType);
+ CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS,
+ sourceType);
if (orderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
@@ -843,7 +846,7 @@
hongBaoV2.setUserInfo(new UserInfo(uid));
hongBaoV2.setPreGetTime(new Date());
hongBaoV2.setGetTime(new Date());
-
+
hongBaoV2Service.insertSelective(hongBaoV2);
// 2.鎻掑叆鍏宠仈
@@ -890,7 +893,8 @@
}
@Override
- public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception {
+ public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo, Integer sourceType)
+ throws UserSystemCouponException, Exception {
if (orderNo == null || orderNo.trim().length() == 0) {
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -968,7 +972,8 @@
}
@Override
- public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception {
+ public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo, Integer sourceType)
+ throws UserSystemCouponException, Exception {
if (orderNo == null || orderNo.trim().length() == 0) {
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -996,7 +1001,8 @@
}
// 璁㈠崟
- CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null, sourceType);
+ CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null,
+ sourceType);
if (orderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
@@ -1266,7 +1272,8 @@
} 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);
+ userOtherMsgNotificationService.couponUsedFreeSheet(record.getUserSystemCoupon(), orderNo,
+ MsgTypeOtherTypeEnum.freeCouponBuy);
}
}
@@ -1274,8 +1281,7 @@
public List<UserSystemCoupon> getCounponNowInvalid(int count) {
return userSystemCouponMapper.getCounponNowInvalid(count);
}
-
-
+
@Transactional
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
@@ -1346,7 +1352,8 @@
} 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);
+ userOtherMsgNotificationService.couponUsingFreeSheet(userSystemCoupon, orderNo, payment,
+ MsgTypeOtherTypeEnum.freeCouponBuy);
}
}
}
@@ -1354,20 +1361,18 @@
return isfree;
}
-
-
@Override
@Transactional
public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
return;
-
+
/*
* if (uid == null || device == null) { return; }
*
* // 鏈櫥闄嗕箣鍓嶆娊濂栬褰� List<DeviceLotteryRecord> list =
- * deviceLotteryRecordService.listByPlatformAndDevice(platform, device); if
- * (list == null || list.size() == 0) { return; }
+ * deviceLotteryRecordService.listByPlatformAndDevice(platform, device);
+ * if (list == null || list.size() == 0) { return; }
*
* // 鑾峰彇棰濆淇℃伅 UserInfoExtra userInfoExtra =
* userInfoExtraService.getUserInfoExtra(uid);
@@ -1383,40 +1388,44 @@
* for (DeviceLotteryRecord reviceLotteryRecord : list) {
*
* // 鍒犻櫎璁板綍
- * deviceLotteryRecordService.deleteByPrimaryKey(reviceLotteryRecord.getId());
+ * deviceLotteryRecordService.deleteByPrimaryKey(reviceLotteryRecord.
+ * getId());
*
* Long systemCouponId = reviceLotteryRecord.getSystemCouponId(); if
* (systemCouponId == null) { continue; } SystemCoupon systemCoupon =
- * systemCouponService.selectByPrimaryKey(systemCouponId); if (systemCoupon ==
- * null) { continue; }
+ * systemCouponService.selectByPrimaryKey(systemCouponId); if
+ * (systemCoupon == null) { continue; }
*
* int stateActivated = 1; if (systemCoupon.getType() ==
* CouponTypeEnum.welfareFreeCoupon) { // 绂忓埄鍒哥姸鎬� long countSuccess =
- * threeSaleSerivce.countSuccessFirstTeam(uid); // 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲� if (countSuccess
- * == 0) { stateActivated = 0; } }
+ * threeSaleSerivce.countSuccessFirstTeam(uid); // 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲� if
+ * (countSuccess == 0) { stateActivated = 0; } }
*
* // 缁撴潫鏃ユ湡 // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶� String endDay =
* DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
- * SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if
- * (endDay != null && endDay.trim().length() > 0) { endDay += " 23:59:59"; }
- * Date endTime = format.parse(endDay);
+ * SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"
+ * ); if (endDay != null && endDay.trim().length() > 0) { endDay +=
+ * " 23:59:59"; } Date endTime = format.parse(endDay);
*
- * UserSystemCoupon userCoupon = new UserSystemCoupon(); userCoupon.setUid(uid);
+ * UserSystemCoupon userCoupon = new UserSystemCoupon();
+ * userCoupon.setUid(uid);
* userCoupon.setSource(UserSystemCoupon.SOURCE_NEWBIES);
* userCoupon.setSystemCoupon(systemCoupon);
* userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- * userCoupon.setStateActivated(stateActivated); userCoupon.setStartTime(new
- * Date()); userCoupon.setEndTime(endTime); userCoupon.setCreateTime(new
- * Date()); userCoupon.setUpdateTime(new Date()); // 鎻掑叆鏁版嵁搴�
- * insertSelective(userCoupon);
+ * userCoupon.setStateActivated(stateActivated);
+ * userCoupon.setStartTime(new Date()); userCoupon.setEndTime(endTime);
+ * userCoupon.setCreateTime(new Date()); userCoupon.setUpdateTime(new
+ * Date()); // 鎻掑叆鏁版嵁搴� insertSelective(userCoupon);
*
* // 鍒告暟閲� coupon++;
*
- * // 娑堟伅鎺ㄩ�� try { if (systemCoupon.getType() == CouponTypeEnum.welfareFreeCoupon)
- * { userOtherMsgNotificationService.welfareCouponGet(userCoupon); } else if
- * (systemCoupon.getType() == CouponTypeEnum.freeCoupon) {
- * userOtherMsgNotificationService.freeSheetCouponGet(userCoupon); } else if
- * (systemCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ * // 娑堟伅鎺ㄩ�� try { if (systemCoupon.getType() ==
+ * CouponTypeEnum.welfareFreeCoupon) {
+ * userOtherMsgNotificationService.welfareCouponGet(userCoupon); } else
+ * if (systemCoupon.getType() == CouponTypeEnum.freeCoupon) {
+ * userOtherMsgNotificationService.freeSheetCouponGet(userCoupon); }
+ * else if (systemCoupon.getType() ==
+ * CouponTypeEnum.rebatePercentCoupon) {
* userOtherMsgNotificationService.rewardCouponGet(userCoupon,
* systemCoupon.getPercent().intValue()); }
*
@@ -1434,34 +1443,33 @@
*/
}
-
-
+
@Override
@Transactional
public void randomRewardCoupon(int num, Long uid, String source) throws Exception {
if (num < 1) {
return;
}
-
+
for (int i = 0; i < num; i++) {
-
+
// 杩斿埄姣�-闅忔満
BigDecimal percent = new BigDecimal(randomNum());
// 鏌ヨ濂栧姳鍒�
- SystemCoupon systemCoupon = systemCouponService.getCouponByTypeAndPercent(
- CouponTypeEnum.rebatePercentCoupon.name(),percent);
+ SystemCoupon systemCoupon = systemCouponService
+ .getCouponByTypeAndPercent(CouponTypeEnum.rebatePercentCoupon.name(), percent);
if (systemCoupon == null) {
return;
}
-
- // 缁撴潫鏃ユ湡 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+
+ // 缁撴潫鏃ユ湡 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (endDay != null && endDay.trim().length() > 0) {
endDay += " 23:59:59";
}
Date endTime = format.parse(endDay);
-
+
UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setUid(uid);
userCoupon.setSource(source);
@@ -1474,11 +1482,11 @@
userCoupon.setUpdateTime(new Date());
// 鎻掑叆鏁版嵁搴�
insertSelective(userCoupon);
-
+
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponGet(userCoupon,systemCoupon.getPercent().intValue());
- } catch(Exception e) {
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon, systemCoupon.getPercent().intValue());
+ } catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
@@ -1486,7 +1494,7 @@
}
}
}
-
+
// 绂忓埄涓績绾㈢偣
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null) {
@@ -1500,15 +1508,28 @@
}
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
}
-
+
+ @Override
+ @Transactional(rollbackFor=Exception.class)
+ public void systemGiveRewardCoupon(Long uid, int num, String orderId, Integer orderType, String reason)
+ throws Exception {
+ // 娣诲姞濂栧姳鍒�
+ insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(), "绯荤粺璧犻��",
+ new BigDecimal(configService.get("exchange_rebate_percent")),false);
+ // 娣诲姞濂栧姳鍒告秷鎭�
+ userOtherMsgNotificationService.systemGiveRewardCoupon(uid, null, MsgOtherSystemGiveDTOFactory
+ .createRewardCouponGive(num, "璇锋寜鐓ц繑鍒╁鍔卞埜瑙勫垯浣跨敤", "杩斿埄濂栧姳鍒�", orderId, orderType, reason));
+ }
+
/**
* 闅忔満鍒告瘮渚�
+ *
* @return
*/
public int randomNum() {
-
+
int result = 1;
-
+
List<RandomProportion> list = new ArrayList<RandomProportion>();
list.add(new RandomProportion(1, 22));
list.add(new RandomProportion(2, 22));
@@ -1529,40 +1550,41 @@
int minRange = 0;
int maxRange = 0;
int randomNum = (int) (1 + Math.round(Math.random() * (199)));
-
+
for (int i = 0; i < list.size(); i++) {
-
+
RandomProportion proportion = list.get(i);
int probability = proportion.probability;
-
+
maxRange = maxRange + probability;
minRange = maxRange - probability;
-
- if(randomNum > minRange && randomNum <= maxRange) {
+
+ if (randomNum > minRange && randomNum <= maxRange) {
result = proportion.num;
break;
}
}
-
+
return result;
}
-
+
class RandomProportion {
- public int num;//鍒稿��
+ public int num;// 鍒稿��
public int probability; // 姒傜巼
-
- RandomProportion () {}
-
- RandomProportion (int num, int probability) {
+
+ RandomProportion() {
+ }
+
+ RandomProportion(int num, int probability) {
this.num = num;
this.probability = probability;
}
}
-
-
+
@Override
@Transactional
- public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception {
+ public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)
+ throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
@@ -1573,7 +1595,7 @@
} else {
coupon = systemCouponService.getCouponByType(couponType);
}
-
+
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
@@ -1581,20 +1603,19 @@
int stateActivated = 1;
if (couponType == CouponTypeEnum.freeCoupon.name()) {
stateActivated = 0; //
- } else if (couponType == CouponTypeEnum.welfareFreeCoupon.name() && threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {
- stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲�
- }
-
-
+ } else if (couponType == CouponTypeEnum.welfareFreeCoupon.name()
+ && threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {
+ stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲�
+ }
+
Integer expiryDay = null;
- if (stateActivated == 0)
+ if (stateActivated == 0)
expiryDay = coupon.getActivateDay();
-
- if (expiryDay == null || expiryDay == 0)
+
+ if (expiryDay == null || expiryDay == 0)
expiryDay = coupon.getExpiryDay();
-
-
- // 璁＄畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶�
+
+ // 璁＄畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶�
String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (endDay != null && endDay.trim().length() > 0) {
@@ -1613,26 +1634,24 @@
userCoupon.setCreateTime(new Date());
userCoupon.setUpdateTime(new Date());
userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-
+
insertSelective(userCoupon);
}
-
-
+
@Transactional
@Override
public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
-
+
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
// 璧犻�佺殑閫�鍥�
sendBackGiveUser(uid);
-
-
+
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
@@ -1659,7 +1678,7 @@
if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
source = "澶╁ぉ鎶�";
}
-
+
userCouponVO.setSource("鏉ユ簮锛�" + source);
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
@@ -1716,7 +1735,7 @@
listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
userCouponVO.setTips(listTip);
userCouponVO.setPopup(true);
-
+
// 楠岃瘉鏄惁宸茬疮璁�3鍗�
executor.execute(new Runnable() {
@Override
@@ -1724,7 +1743,7 @@
freeCouponActivate(userCouponVO.getId(), uid, userCouponVO.getCreateTime());
}
});
-
+
} else if (CouponTypeEnum.welfareFreeCoupon == type) {
jumpBtn = new HashMap<String, Object>();
if (inviteCode != null && inviteCode.trim().length() > 0) {
@@ -1733,7 +1752,7 @@
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
}
}
- }
+ }
}
if (UserSystemCoupon.STATE_IN_USE == state && (CouponTypeEnum.freeCouponBuy == type
@@ -1750,9 +1769,9 @@
if (give == null) {
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) {
@@ -1770,7 +1789,7 @@
// 璁㈠崟鍒楄〃
jumpLink.put("state", "2"); // 宸叉敹璐�
jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
- jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
+ jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
jumpLink.put("title", "杩斿埄璁㈠崟"); // 鏍囬鍚�
jumpLink.put("goodsType", "0"); // 璁㈠崟鏉ユ簮
jumpBtn = new HashMap<String, Object>();
@@ -1781,33 +1800,36 @@
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_rebate_percent_coupon_tips");
tokenType = TokenTypeEnum.rebatePercentCoupon;
}
-
+
if (!StringUtil.isNullOrEmpty(tips) && tokenType != null) {
- UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, userCouponVO.getId());
+ UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid,
+ userCouponVO.getId());
if (record != null) {
- TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenType.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鍚嶇О}")) {
+ while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ 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>();
@@ -1815,21 +1837,21 @@
remainDays.put("fontColor", "#F14242");
userCouponVO.setRemainDays(remainDays);
}
- }
- }
+ }
+ }
} else if (UserSystemCoupon.STATE_END_USE == state) {
-
+
if (give) {
userCouponVO.setCouponRule(systemCoupon.getRemark());
if (CouponTypeEnum.freeCouponGive == type) {
userCouponVO.setCouponEffect("浠绘��0鍏冭喘");
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>();
@@ -1846,79 +1868,77 @@
userCouponVO.setRemainDays(remainDays);
}
}
-
- }else if (UserSystemCoupon.STATE_OVERDUE == state) {
+
+ } 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)
+
+ if (give)
userCouponVO.setCouponRule(systemCoupon.getRemark());
}
userCouponVO.setJumpBtn(jumpBtn);
}
return listVO;
}
-
-
+
@Transactional
@Override
public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException {
UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
if (userSystemCoupon == null)
throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
-
+
SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
if (systemCoupon == null)
throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
-
+
systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (systemCoupon == null)
throw new UserSystemCouponException(1, "璇ュ埜宸插け鏁�");
-
+
Integer state = userSystemCoupon.getState();
- if (state != UserSystemCoupon.STATE_CAN_USE)
+ if (state != UserSystemCoupon.STATE_CAN_USE)
throw new UserSystemCouponException(1, "璇ュ埜宸茶浣跨敤鎴栬禒閫�");
-
+
CouponTypeEnum type = systemCoupon.getType();
- if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon )
+ if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon)
throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
-
+
String tips = null;
TokenTypeEnum tokenTypeEnum = null;
if (type == CouponTypeEnum.freeCouponGive) {
tokenTypeEnum = TokenTypeEnum.freeCoupon;
tips = configService.get("give_free_coupon_tips");
- } else if (type == CouponTypeEnum.rebatePercentCoupon){
+ } else if (type == CouponTypeEnum.rebatePercentCoupon) {
tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
tips = configService.get("give_rebate_percent_coupon_tips");
} else {
throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
}
-
+
if (StringUtil.isNullOrEmpty(tips))
throw new UserSystemCouponException(1, "tips鏁版嵁缂哄け");
-
-
+
// 鏄惁鏈�杩戠敓鎴愬彛浠ゆ湁鏁�
UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, id);
if (record != null) {
- TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenTypeEnum.name(), id+"");
+ TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenTypeEnum.name(), id + "");
if (tokenRecord != null && !StringUtil.isNullOrEmpty(tokenRecord.getToken())) {
String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
- while(tips.contains("{APP鍚嶇О}")) {
+ while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
-
+ tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
+ configService.get("app_down_link"));
+
return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
}
}
-
-
+
Date nowDate = new Date();
// 鎻掑叆璧犻�佽褰�
UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord();
@@ -1927,28 +1947,28 @@
giveRecord.setGiveTime(nowDate);
giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate));
userSystemCouponGiveRecordService.insertSelective(giveRecord);
-
+
// 鍒涘缓璁板綍
TokenRecord tokenRecord = new TokenRecord();
tokenRecord.setUid(uid);
- tokenRecord.setIdentify(giveRecord.getId()+"");
+ tokenRecord.setIdentify(giveRecord.getId() + "");
tokenRecord.setType(tokenTypeEnum);
tokenRecord.setStartTime(nowDate);
tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, nowDate));
tokenRecord.setState(0);
tokenRecordService.insertSelective(tokenRecord);
-
+
// 鍒涘缓鍙ｄ护
String token = TokenUtil.createToken(tokenRecord.getId());
tokenRecord.setToken(token);
tokenRecordService.updateByPrimaryKeySelective(tokenRecord);
-
+
// 鍒哥姸鎬�
userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE);
userSystemCoupon.setGive(true);
userSystemCoupon.setUpdateTime(nowDate);
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
+
// 鎻掑叆浣跨敤鍒歌褰�
UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
couponRecord.setState(UserSystemCouponRecord.STATE_GIVE_ON);
@@ -1957,18 +1977,17 @@
couponRecord.setCreateTime(nowDate);
couponRecord.setUpdateTime(nowDate);
userSystemCouponRecordService.insertSelective(couponRecord);
-
+
String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
- while(tips.contains("{APP鍚嶇О}")) {
+ while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
-
+
return createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
}
-
-
- private UserSystemCouponVO createUserCouponVOo(UserSystemCoupon userSystemCoupon, SystemCoupon systemCoupon,
+
+ private UserSystemCouponVO createUserCouponVOo(UserSystemCoupon userSystemCoupon, SystemCoupon systemCoupon,
UserSystemCouponGiveRecord record, String tips) {
UserSystemCouponVO userCouponVO = new UserSystemCouponVO();
userCouponVO.setId(userSystemCoupon.getId());
@@ -1981,7 +2000,7 @@
userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
userCouponVO.setCouponPicture(systemCoupon.getPicture());
userCouponVO.setGiveTips(tips);
-
+
String couponTerm = "鏈夋晥鏈燂細";
Date startTime = userCouponVO.getStartTime();
Date endTime = userCouponVO.getEndTime();
@@ -1990,57 +2009,55 @@
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;
}
-
/**
* 鍏嶅崟鍒告縺娲�
+ *
* @param uid
*/
- public void freeCouponActivate(Long id,Long uid, Date date) {
+ public void freeCouponActivate(Long id, Long uid, Date date) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
long count = commonOrderCountService.countValidOrderByDate(uid, sdf.format(date));
-
+
String activateNum = configService.get("free_coupon_activate_num");
int num = Integer.parseInt(activateNum);
-
+
if (count >= num) {
UserSystemCoupon coupon = userSystemCouponMapper.selectByPrimaryKey(id);
if (coupon == null || coupon.getState() != UserSystemCoupon.STATE_CAN_USE
|| coupon.getStateActivated() != 0)
return;
-
+
Date nowDate = new Date();
Date endTime2 = coupon.getEndTime();
if (endTime2 != null && endTime2.getTime() <= nowDate.getTime())
return;
-
-
+
SystemCoupon systemCoupon = coupon.getSystemCoupon();
if (systemCoupon == null)
return;
-
+
systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (systemCoupon == null || systemCoupon.getType() != CouponTypeEnum.freeCoupon)
return;
-
try {
- Integer expiryDay = systemCoupon.getExpiryDay();
+ Integer expiryDay = systemCoupon.getExpiryDay();
String endDay = DateUtil.plusDay(expiryDay - 1, nowDate);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (endDay != null && endDay.trim().length() > 0) {
endDay += " 23:59:59";
}
Date endTime = format.parse(endDay);
-
+
UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setId(coupon.getId());
userCoupon.setStateActivated(1);
@@ -2048,24 +2065,24 @@
userCoupon.setStartTime(nowDate);
userCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
-
+
// 璧犻�佽褰�
UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByReceiveId(id);
- if (giveRecord == null)
+ if (giveRecord == null)
return;
-
+
Long giveUid = giveRecord.getGiveUid();
UserInfo userInfo = userInfoService.selectByPKey(giveUid);
- if (userInfo == null)
+ if (userInfo == null)
return;
-
+
String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績涓煡鐪�";
SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
MsgOtherCouponActivateDTO msgOther = new MsgOtherCouponActivateDTO();
msgOther.setTitle("鍏嶅崟鍒告縺娲�");
msgOther.setType("鍏嶅崟鍒哥郴缁熷凡鑷姩婵�娲�");
- msgOther.setExplain("婊¤冻"+ systemCoupon.getActivateDay() +"澶╁唴浜х敓"+ num +"绗斿凡鍒拌处杩斿埄璁㈠崟");
- msgOther.setGiveUser("鏄电О锛�"+ userInfo.getNickName() +" ID锛�" + giveUid);
+ msgOther.setExplain("婊¤冻" + systemCoupon.getActivateDay() + "澶╁唴浜х敓" + num + "绗斿凡鍒拌处杩斿埄璁㈠崟");
+ msgOther.setGiveUser("鏄电О锛�" + userInfo.getNickName() + " ID锛�" + giveUid);
msgOther.setReceiveTime(sd.format(giveRecord.getReceiveTime()));
msgOther.setValidityTime(expiryDay + "澶�");
userOtherMsgNotificationService.giveCouponActivateMsg(uid, beiZhu, msgOther);
@@ -2075,8 +2092,7 @@
}
}
}
-
-
+
@Transactional
@Override
public void updateInvalidSate(Long uid) {
@@ -2086,8 +2102,7 @@
}
updateCounponInvalid(list);
}
-
-
+
@Override
public void updateCounponInvalid(List<UserSystemCoupon> list) {
if (list == null || list.size() == 0) {
@@ -2104,7 +2119,7 @@
if (baseCoupon == null) {
continue;
}
-
+
baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
if (baseCoupon == null || baseCoupon.getId() == null) {
continue;
@@ -2118,7 +2133,7 @@
userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
} else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
- }else if (baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponBuy);
} else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
userOtherMsgNotificationService.outOfDate(userSystemCoupon, MsgTypeOtherTypeEnum.freeCouponGive);
@@ -2132,8 +2147,7 @@
}
}
}
-
-
+
/**
* 閫�鍥炲埜 鍒濆鏁版嵁
*
@@ -2142,11 +2156,11 @@
public void sendBackCoupon(UserSystemCoupon userCoupon, UserSystemCouponRecord record) throws Exception {
if (userCoupon == null)
return;
-
+
Integer state = userCoupon.getState();
- if (state != UserSystemCoupon.STATE_IN_USE)
+ if (state != UserSystemCoupon.STATE_IN_USE)
return;
-
+
Date now = new Date();
Date endTime = userCoupon.getEndTime();
if (endTime != null && endTime.getTime() < now.getTime()) {
@@ -2156,7 +2170,7 @@
updateCounponInvalid(list);
return;
}
-
+
// 閫�鍥炲埜
UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
userSystemCoupon.setId(userCoupon.getId());
@@ -2165,20 +2179,20 @@
userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
+
// 浣跨敤璁板綍
- if (record != null) {
+ if (record != null) {
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);
+ userOtherMsgNotificationService.couponDrawBack(userSystemCoupon, record.getOrderNo(),
+ MsgTypeOtherTypeEnum.freeCouponBuy);
}
}
}
-
-
+
@Async()
@Transactional
@Override
@@ -2190,11 +2204,11 @@
}
List<Long> list = new ArrayList<Long>();
- for (SystemCoupon systemCoupon: couponList) {
+ for (SystemCoupon systemCoupon : couponList) {
list.add(systemCoupon.getId());
}
-
- // 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫厤鍗曞埜
+
+ // 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫厤鍗曞埜
List<UserSystemCoupon> listUserCoupon = userSystemCouponMapper.getCouponByUsingTimeOut(uid, list, 600L);
if (listUserCoupon == null || listUserCoupon.size() == 0) {
return;
@@ -2208,7 +2222,7 @@
userSystemCoupon.setUseTime(null);
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
+
UserSystemCouponRecord record = userSystemCouponRecordService.getNearByUserCouponId(userCoupon.getId());
if (record != null) {
UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
@@ -2220,41 +2234,40 @@
}
}
-
@Transactional
@Override
public void sendBackGiveUser(Long uid) {
- List<UserSystemCouponGiveRecord> list =userSystemCouponGiveRecordService.overdueListByUser(uid);
+ List<UserSystemCouponGiveRecord> list = userSystemCouponGiveRecordService.overdueListByUser(uid);
if (list == null || list.size() == 0) {
return;
}
sendBackGiveCoupon(list);
}
-
+
@Override
public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
- for (UserSystemCouponGiveRecord record: overdueList) {
+ for (UserSystemCouponGiveRecord record : overdueList) {
// 鏇存柊璧犻�佽褰�
UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
updateRecord.setId(record.getId());
updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);
userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);
-
+
// 鏇存柊鍒镐俊鎭�
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)
+ if (state != UserSystemCoupon.STATE_IN_USE)
return;
-
+
Date now = new Date();
Date endTime = userCoupon.getEndTime();
if (endTime != null && endTime.getTime() < now.getTime()) {
@@ -2263,7 +2276,7 @@
updateCounponInvalid(list);
continue;
}
-
+
// 閫�鍥炲埜
UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
userSystemCoupon.setId(userCoupon.getId());
@@ -2272,25 +2285,24 @@
userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
+
// 浣跨敤璁板綍
UserSystemCouponRecord useRecord = userSystemCouponRecordService.getNearByUserCouponId(couponId);
- if (useRecord != null) {
+ 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)
+ if (systemCoupon != null)
systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
-
+
if (systemCoupon == null)
continue;
-
-
+
// 閫�鍥炴秷鎭�
String couponName = systemCoupon.getName();
if (CouponTypeEnum.freeCouponGive == systemCoupon.getType()) {
@@ -2298,63 +2310,63 @@
} else if (CouponTypeEnum.rebatePercentCoupon == 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.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) {
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
String percent = configService.get("exchange_rebate_percent");
- if (StringUtil.isNullOrEmpty(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) {
- // 杩囨湡鍒�
- updateInvalidSate(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());
+ List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(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{
+ public boolean getIncludeNotExchange(Long uid) {
// 杩囨湡鍒�
updateInvalidSate(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 {
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
String percent = configService.get("exchange_rebate_percent");
- if (StringUtil.isNullOrEmpty(percent))
+ if (StringUtil.isNullOrEmpty(percent))
percent = "35";
-
- List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
+
+ List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid,
+ Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
if (listCoupon == null || listCoupon.size() == 0)
return null;
@@ -2363,14 +2375,14 @@
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());
@@ -2417,10 +2429,10 @@
return listCoupon;
}
-
-
+
@Override
public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
return userSystemCouponMapper.getFreeCouponByType(uid, type);
}
+
}
--
Gitblit v1.8.0