From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 819 ++++++++++++++++++++++------------------------------------
1 files changed, 308 insertions(+), 511 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 996f96f..0eaada1 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
@@ -29,10 +29,7 @@
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
import com.yeshi.fanli.dto.mq.user.body.UserSystemCouponUseMQMsg;
-import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
-import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
-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;
import com.yeshi.fanli.entity.bus.user.TokenRecord;
@@ -46,6 +43,7 @@
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -73,16 +71,16 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.TokenUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
-import com.yeshi.fanli.util.factory.msg.MsgOtherSystemGiveDTOFactory;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -117,6 +115,7 @@
@Resource
private SystemCouponService systemCouponService;
+ @Lazy
@Resource
private CommonOrderService commonOrderService;
@@ -176,15 +175,12 @@
@Resource
private UserSystemCouponActivateService userSystemCouponActivateService;
-
+
@Resource(name = "producer")
private Producer producer;
- @Lazy
@Resource
- private UserVIPInfoService userVIPInfoService;
-
-
+ private UserInviteService userInviteService;
@Override
public int insertSelective(UserSystemCoupon record) {
@@ -231,84 +227,79 @@
return userSystemCouponMapper.countUserCouponList(uid);
}
+
+
@Override
- @Transactional
- public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,
- Boolean needNotify) throws UserSystemCouponException, Exception {
-
- if (couponType == null || uid == null) {
+ @Transactional(rollbackFor=Exception.class)
+ public UserSystemCoupon freeCouponWin(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify) throws UserSystemCouponException, Exception{
+ if (typeEnum == null || uid == null || StringUtil.isNullOrEmpty(source) || num < 1) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
-
- SystemCoupon coupon = null;
- 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)) < 1) {
- randomRewardCoupon(1, uid, source);
- return null;
- } else {
- coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
- }
- } else if (couponType.equals(CouponTypeEnum.freeCouponGive.name())) {
- coupon = systemCouponService.getCouponByType(couponType);
- }
-
+
+ SystemCoupon coupon = systemCouponService.getCouponByType(typeEnum.name());
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
-
- int stateActivated = 1;
- if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
- // 绂忓埄鍒哥姸鎬�
- long countSuccess = threeSaleSerivce.countSuccessFirstTeam(uid);
- // 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲�
- if (countSuccess == 0) {
- stateActivated = 0;
- }
- } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
- stateActivated = 0;
+
+ // 婵�娲荤姸鎬�
+ int stateActivated = 0;
+ // 鑷喘鍏嶅崟鍒搞�佽禒閫佸厤鍗曞埜鍙洿鎺ヤ娇鐢�
+ if (coupon.getType() == CouponTypeEnum.freeCouponBuy || coupon.getType() == CouponTypeEnum.freeCouponGive) {
+ stateActivated = 1;
}
-
+
+ // 鏈夋晥鏃堕暱
Integer expiryDay = null;
if (stateActivated == 0)
expiryDay = coupon.getActivateDay();
-
if (expiryDay == null || expiryDay == 0)
expiryDay = coupon.getExpiryDay();
-
- // 缁撴潫鏃ユ湡
- // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
- String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
+
+ // 璁＄畻缁撴潫鏃ユ湡
+ Date nowTime = new Date();
+ String endDay = DateUtil.plusDay(expiryDay - 1, nowTime);
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);
- userCoupon.setSystemCoupon(coupon);
- userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- userCoupon.setStateActivated(stateActivated);
- userCoupon.setStartTime(new Date());
- userCoupon.setEndTime(endTime);
- userCoupon.setCreateTime(new Date());
- userCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.insertSelective(userCoupon);
- if(coupon.getType() == CouponTypeEnum.freeCoupon) {
- userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
- }
-
+ UserSystemCoupon userSystemCoupon = null;
+ for (int i = 0; i < num; i ++) {
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setUid(uid);
+ userCoupon.setSource(source);
+ userCoupon.setSystemCoupon(coupon);
+ userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userCoupon.setStateActivated(stateActivated);
+ userCoupon.setStartTime(nowTime);
+ userCoupon.setEndTime(endTime);
+ userCoupon.setCreateTime(nowTime);
+ userCoupon.setUpdateTime(nowTime);
+ userSystemCouponMapper.insertSelective(userCoupon);
+ // 闇�瑕佹縺娲诲埜
+ if (typeEnum == CouponTypeEnum.freeCoupon) {
+ userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
+ }
+
+ if (num == 1) {
+ userSystemCoupon = userCoupon;
+ }
+ }
+
executor.execute(new Runnable() {
@Override
- public void run() { // 绂忓埄涓績绾㈢偣
+ public void run() {
+ if (notify) { // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, typeEnum.getDesc(), source,
+ num, "鎴愬姛鑾峰緱", nowTime, endTime);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ // 绂忓埄涓績绾㈢偣
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null) {
UserInfoExtra updateExtra = new UserInfoExtra();
@@ -322,31 +313,88 @@
}
}
});
+
+ return userSystemCoupon;
+ }
+
+
- // 娑堟伅鎺ㄩ��
- if (needNotify) {
- 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());
+ @Override
+ @Transactional(rollbackFor=Exception.class)
+ public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify,
+ BigDecimal percent) throws UserSystemCouponException, Exception{
+ if (uid == null || percent == null|| StringUtil.isNullOrEmpty(source) || num < 1) {
+ throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
+ }
+
+ String name = CouponTypeEnum.rebatePercentCoupon.name();
+ SystemCoupon coupon = systemCouponService.getCouponByTypeAndPercent(name, percent);
+ if (coupon == null) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
+ }
+
+ // 璁＄畻缁撴潫鏃ユ湡
+ Date nowTime = new Date();
+ Integer expiryDay = coupon.getExpiryDay();
+ String endDay = DateUtil.plusDay(expiryDay - 1, nowTime);
+ 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 userSystemCoupon = null;
+ for (int i = 0; i < num; i ++) {
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setUid(uid);
+ userCoupon.setSource(source);
+ userCoupon.setSystemCoupon(coupon);
+ userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userCoupon.setStateActivated(1);
+ userCoupon.setStartTime(nowTime);
+ userCoupon.setEndTime(endTime);
+ userCoupon.setCreateTime(nowTime);
+ userCoupon.setUpdateTime(nowTime);
+ userSystemCouponMapper.insertSelective(userCoupon);
+ if (num == 1) {
+ userSystemCoupon = userCoupon;
+ }
+ }
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ if (notify) { // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, num, "鎴愬姛鑾峰緱", nowTime, endTime);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
-
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
+
+ // 绂忓埄涓績绾㈢偣
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+ if (extra != null) {
+ UserInfoExtra updateExtra = new UserInfoExtra();
+ updateExtra.setId(extra.getId());
+ if (extra.getCouponNews() == null) {
+ updateExtra.setCouponNews(1);
+ } else {
+ updateExtra.setCouponNews(extra.getCouponNews() + 1);
+ }
+ userInfoExtraService.updateByPrimaryKeySelective(updateExtra);
}
}
- }
-
- return userCoupon;
+ });
+
+ return userSystemCoupon;
}
+
+
+
+
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
throws UserSystemCouponException, Exception {
@@ -451,7 +499,7 @@
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
// 鍏嶅崟鍟嗗搧鍒楄〃
- jumpLink.put("url", configService.get("free_goods_list"));
+ jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
@@ -469,7 +517,7 @@
} else if (UserSystemCoupon.STATE_IN_USE == state) {
// 浣跨敤涓�
- userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+ userCouponVO.setInUseExplain(configService.get(ConfigKeyEnum.freeCouponUsingHelp.getKey()));
}
}
@@ -612,7 +660,7 @@
return hasCoupon;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
@@ -635,7 +683,7 @@
return getEnableListByCouponId(uid, 1, couponList);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
throws UserSystemCouponException, Exception {
@@ -741,7 +789,7 @@
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType)
throws UserSystemCouponException, Exception {
@@ -818,7 +866,7 @@
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData)
throws UserSystemCouponException, Exception {
@@ -855,44 +903,62 @@
if (orderNo == null || orderNo.trim().length() == 0)
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
- // 璁㈠崟
- CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS,
- sourceType);
- if (orderVO == null)
- throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
-
- // 鐗堟湰鍖哄垎锛�2.0.2
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- Date thirdCreateTime = orderVO.getThirdCreateTime();
- if (thirdCreateTime != null) {
- long downOrderTime = thirdCreateTime.getTime();
- long limitDate = Long.parseLong("1573315200000"); // TODO
- // 鏃ユ湡寰呯‘瀹�2019-11-10
- if (downOrderTime > limitDate) {
- Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
- long currentTime = java.lang.System.currentTimeMillis();
- if (endDay.getTime() > currentTime) {
- boolean valid = false;
- DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
- if (dateInfo != null) {
- if (dateInfo.getDay() > 0)
- valid = true;
-
- if (!valid && dateInfo.getHour() > 0)
- valid = true;
-
- if (!valid && dateInfo.getMinute() > 0)
- valid = true;
-
- if (!valid && dateInfo.getSecond() >= 0)
- valid = true;
- }
-
- if (!valid)
- throw new UserSystemCouponException(1, "璇ヨ鍗曞凡涓嶈兘浣跨敤浣跨敤濂栧姳鍒革紝璇︽儏璇峰挩璇㈠鏈�");
- }
+ // 妫�鏌ヨ鍗曞彿鏄惁缁存潈
+ List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderNo);
+ boolean weiquan = false;
+ if (commonOrderList != null) {
+ for (CommonOrder commonOrder : commonOrderList) {
+ if (commonOrder.getState() == CommonOrder.STATE_WQ) {
+ weiquan = true;
+ break;
}
}
+ }
+
+ if (weiquan) {
+ throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝鍞悗缁存潈璁㈠崟涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
+ }
+
+
+ // 璁㈠崟
+ List<CommonOrderVO> listVo = commonOrderService.listGroupOrderNoByUid(0, 1, uid, 2, 1,1, orderNo, null,
+ null, null, sourceType);
+ if (listVo == null || listVo.size() == 0)
+ throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝璇ヨ鍗曞凡涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
+
+ CommonOrderVO orderVO = listVo.get(0);
+
+ // 2.1鏂扮増
+ Date thirdCreateTime = orderVO.getThirdCreateTime();
+ Date accountTime = orderVO.getAccountTime();
+ if (thirdCreateTime == null || accountTime == null)
+ throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
+
+ long downOrderTime = thirdCreateTime.getTime();
+ long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+ if (downOrderTime > limitDate) {
+ boolean valid = false;
+ Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
+ long currentTime = java.lang.System.currentTimeMillis();
+ if (endDay.getTime() > currentTime) {
+ DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
+ if (dateInfo != null) {
+ if (dateInfo.getDay() > 0)
+ valid = true;
+
+ if (!valid && dateInfo.getHour() > 0)
+ valid = true;
+
+ if (!valid && dateInfo.getMinute() > 0)
+ valid = true;
+
+ if (!valid && dateInfo.getSecond() > 0)
+ valid = true;
+ }
+ }
+
+ if (!valid)
+ throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
}
BigDecimal hongBao = orderVO.getHongBao();
@@ -917,30 +983,33 @@
UserSystemCouponUseMQMsg mqMsg = new UserSystemCouponUseMQMsg(userSystemCoupon.getId(), order.getOrderId(),
sourceType, systemCoupon.getType().name());
- // 浜嬪姟娑堟伅
- Message msg =MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.useSystemCoupon,
- mqMsg);
- try {
- SendResult result = orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
- @Override
- public TransactionStatus execute(Message arg0, Object arg1) {
- try {
- useRewardCouponCore(userSystemCoupon, money, hongBao, uid, order);
- return TransactionStatus.CommitTransaction;
- } catch (Exception e) {
- return TransactionStatus.RollbackTransaction;
+
+ if (Constant.IS_TEST) {
+ useRewardCouponCore(userSystemCoupon, money, hongBao, uid, order);
+ } else { // 浜嬪姟娑堟伅
+ Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.useSystemCoupon, mqMsg);
+ try {
+ SendResult result = orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
+ @Override
+ public TransactionStatus execute(Message arg0, Object arg1) {
+ try {
+ useRewardCouponCore(userSystemCoupon, money, hongBao, uid, order);
+ return TransactionStatus.CommitTransaction;
+ } catch (Exception e) {
+ return TransactionStatus.RollbackTransaction;
+ }
}
- }
- }, null);
- System.out.println(result);
- } catch (Exception e) {
- e.printStackTrace();
- throw e;
+ }, null);
+ System.out.println(result);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ }
}
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void useRewardCouponCore(UserSystemCoupon userSystemCoupon, BigDecimal money, BigDecimal hongBao, Long uid,
Order order) throws Exception {
org.springframework.transaction.TransactionStatus transactionStatus = transactionManager
@@ -996,7 +1065,7 @@
userInfoService.selectByPKey(uid).getMyHongBao());
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, order.getOrderId());
+ userOtherMsgNotificationService.rewardCouponEndMsg(uid, userSystemCoupon.getSource(), 1, "浣跨敤鎴愬姛");
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -1078,9 +1147,9 @@
userRecordVO.setJumpWelfare(jumpWelfare);
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("reward_coupon_help"));
+ userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
- String rewardCouponRemark = configService.get("reward_coupon_remark");
+ String rewardCouponRemark = configService.get(ConfigKeyEnum.rewardCouponRemark.getKey());
if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
}
@@ -1139,7 +1208,7 @@
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("free_coupon_help"));
+ userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
@@ -1177,7 +1246,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get("free_coupon_back_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
// 閫�娆�
@@ -1196,7 +1265,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get("free_coupon_back_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
} else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
// 鍏嶅崟涓�
@@ -1210,7 +1279,7 @@
progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
}
- rewardCouponRemark = configService.get("free_coupon_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
// 鍏嶅崟鎴愬姛
@@ -1232,7 +1301,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
- rewardCouponRemark = configService.get("free_coupon_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
}
userRecordVO.setProgressState(progressState);
userRecordVO.setPayMoney(payMoney);
@@ -1291,59 +1360,8 @@
return userRecordVO;
}
- @Transactional
- @Override
- public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {
- LogHelper.test("鍒告縺娲�:" + uid);
- if (uid == null) {
- return;
- }
- // 绂忓埄鍏嶅崟鍒�
- String welfareFree = CouponTypeEnum.welfareFreeCoupon.name();
-
- SystemCoupon systemCoupon = systemCouponService.getCouponByType(welfareFree);
- if (systemCoupon == null) {
- return;
- }
-
- // 寰呮椿绂忓埄鍏嶅崟鍒�
- List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
- if (list == null || list.size() == 0) {
- return;
- }
-
- for (UserSystemCoupon userSystemCoupon : list) {
- // 婵�娲�
- UserSystemCoupon update = new UserSystemCoupon();
- update.setId(userSystemCoupon.getId());
- update.setStateActivated(1);
- update.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKeySelective(update);
-
- Integer state = userSystemCoupon.getState();
- if (UserSystemCoupon.STATE_OVERDUE == state) {
- continue; // 宸插け鏁堜笉鍋氭秷鎭帹閫�
- }
-
- // 娑堟伅鎺ㄩ��
- try {
- UserInfo userInfo = new UserInfo();
- userInfo.setId(uid);
- userInfo.setNickName(fromNickName);
-
- userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
- }
- }
-
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void updateStateByDrawback(String orderNo) throws Exception {
@@ -1365,7 +1383,7 @@
sendBackCoupon(record.getUserSystemCoupon(), record);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void updateStateByArrivalAccount(String orderNo) throws Exception {
@@ -1382,24 +1400,15 @@
record.setUpdateTime(new Date());
record.setState(UserSystemCouponRecord.STATE_SUCCESS);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
-
- // 娑堟伅鎺ㄩ��
- if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
- 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);
- }
}
-
+
+
@Override
public List<UserSystemCoupon> getCounponNowInvalid(int count) {
return userSystemCouponMapper.getCounponNowInvalid(count);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
throws Exception {
@@ -1463,193 +1472,21 @@
if (couponType == null || couponType.trim().length() == 0) {
throw new Exception("鍒哥被鍨嬫湭琚褰�");
}
-
- if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
- 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);
- }
}
}
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; }
- *
- * // 鑾峰彇棰濆淇℃伅 UserInfoExtra userInfoExtra =
- * userInfoExtraService.getUserInfoExtra(uid);
- *
- * // 宸茬粡鎶借繃濂栫殑鎴栬�呭凡缁忚繘鍏ヨ繃鎶藉椤甸潰鐨� if (userInfoExtra != null &&
- * userInfoExtra.getLotteryNewbies() != null) { return; }
- *
- * // 鏄惁鏄柊鐢ㄦ埛 boolean isNewUser = userInfoExtraService.isNewUser(uid); if
- * (!isNewUser) { return; }
- *
- * int coupon = 0;
- *
- * for (DeviceLotteryRecord reviceLotteryRecord : list) {
- *
- * // 鍒犻櫎璁板綍
- * deviceLotteryRecordService.deleteByPrimaryKey(reviceLotteryRecord.
- * getId());
- *
- * Long systemCouponId = reviceLotteryRecord.getSystemCouponId(); if
- * (systemCouponId == null) { continue; } SystemCoupon systemCoupon =
- * 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; } }
- *
- * // 缁撴潫鏃ユ湡 // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶� 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(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);
- *
- * // 鍒告暟閲� 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) {
- * userOtherMsgNotificationService.rewardCouponGet(userCoupon,
- * systemCoupon.getPercent().intValue()); }
- *
- * } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch
- * (Exception e1) { e1.printStackTrace(); } } }
- *
- * if (userInfoExtra == null) { userInfoExtra = new UserInfoExtra();
- * userInfoExtra.setUserInfo(new UserInfo(uid)); }
- *
- * userInfoExtra.setLotteryNewbies(Constant.MAX_COUNT_LOTTERY_NEWBIES -
- * list.size()); Integer couponNews = userInfoExtra.getCouponNews(); if
- * (couponNews == null) { userInfoExtra.setCouponNews(coupon); } else {
- * userInfoExtra.setCouponNews(couponNews + coupon); }
- * userInfoExtraService.saveUserInfoExtra(userInfoExtra);
- */
-
- }
-
- @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);
- 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);
- userCoupon.setSystemCoupon(systemCoupon);
- userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- userCoupon.setStateActivated(1);
- userCoupon.setStartTime(new Date());
- userCoupon.setEndTime(endTime);
- userCoupon.setCreateTime(new Date());
- userCoupon.setUpdateTime(new Date());
- // 鎻掑叆鏁版嵁搴�
- insertSelective(userCoupon);
-
- // 娑堟伅鎺ㄩ��
- try {
- userOtherMsgNotificationService.rewardCouponGet(userCoupon, systemCoupon.getPercent().intValue());
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
- }
-
- // 绂忓埄涓績绾㈢偣
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra == null) {
- return;
- }
-
- UserInfoExtra extra = new UserInfoExtra();
- extra.setId(userInfoExtra.getId());
- Integer couponNews = userInfoExtra.getCouponNews();
- if (couponNews == null) {
- extra.setCouponNews(num);
- } else {
- extra.setCouponNews(couponNews + num);
- }
- userInfoExtraService.saveUserInfoExtra(extra);
- }
-
- @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() {
-
+ private int randomCounponPercent() {
int result = 1;
-
List<RandomProportion> list = new ArrayList<RandomProportion>();
list.add(new RandomProportion(1, 22));
list.add(new RandomProportion(2, 22));
@@ -1670,21 +1507,16 @@
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) {
result = proportion.num;
break;
}
}
-
return result;
}
@@ -1702,7 +1534,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)
throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
@@ -1758,7 +1590,7 @@
insertSelective(userCoupon);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -1858,7 +1690,7 @@
// 缁熻寰呮縺娲绘暟閲�
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
- String activateNum = configService.get("free_coupon_activate_num");
+ String activateNum = configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey());
userCouponVO.setCouponEffect(
"(" + activateCount + "/" + Integer.parseInt(activateNum) + ")寰呮縺娲�");
}
@@ -1896,16 +1728,16 @@
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
} else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type
|| CouponTypeEnum.freeCouponBuy == type) {
- jumpLink.put("url", configService.get("free_goods_list"));
+ jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
} else if (CouponTypeEnum.rebatePercentCoupon == type) {
- if (userVIPInfoService.isVIP(uid)) { // 浼氬憳鍙彲璧犻��
+ if (userInviteService.verifyVIP(uid)) { // 浼氬憳鍙彲璧犻��
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
} else {// 鍙娇鐢� 鍙禒閫�
userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
-
+
jumpLink.put("state", "2"); // 宸叉敹璐�
jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
@@ -1924,13 +1756,13 @@
TokenTypeEnum tokenType = null;
if (CouponTypeEnum.freeCouponGive == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
tokenType = TokenTypeEnum.freeCoupon;
}
if (CouponTypeEnum.rebatePercentCoupon == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_rebate_percent_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
tokenType = TokenTypeEnum.rebatePercentCoupon;
}
@@ -1946,7 +1778,7 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get("app_down_link"));
+ configService.get(ConfigKeyEnum.appDownLink.getKey()));
userCouponVO.setGiveTips(tips);
}
@@ -2005,7 +1837,7 @@
return listVO;
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException {
UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
@@ -2032,10 +1864,10 @@
TokenTypeEnum tokenTypeEnum = null;
if (type == CouponTypeEnum.freeCouponGive) {
tokenTypeEnum = TokenTypeEnum.freeCoupon;
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
} else if (type == CouponTypeEnum.rebatePercentCoupon) {
tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
- tips = configService.get("give_rebate_percent_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
} else {
throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
}
@@ -2053,19 +1885,20 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get("app_down_link"));
+ configService.get(ConfigKeyEnum.appDownLink.getKey()));
return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
}
}
Date nowDate = new Date();
+ Date endTime = DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate);
// 鎻掑叆璧犻�佽褰�
UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord();
giveRecord.setCouponId(id);
giveRecord.setGiveUid(uid);
giveRecord.setGiveTime(nowDate);
- giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate));
+ giveRecord.setEndTime(endTime);
userSystemCouponGiveRecordService.insertSelective(giveRecord);
// 鍒涘缓璁板綍
@@ -2074,7 +1907,7 @@
tokenRecord.setIdentify(giveRecord.getId() + "");
tokenRecord.setType(tokenTypeEnum);
tokenRecord.setStartTime(nowDate);
- tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, nowDate));
+ tokenRecord.setEndTime(endTime);
tokenRecord.setState(0);
tokenRecordService.insertSelective(tokenRecord);
@@ -2102,21 +1935,22 @@
while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey()));
UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
-
+
UserSystemCouponUseMQMsg msg = new UserSystemCouponUseMQMsg();
msg.setUserSystemCouponId(id);
msg.setCouponType(type.name());
- Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback,
- msg);
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback, msg);
+ // 寤惰繜涓�鍒嗛挓
+ message.setStartDeliverTime(endTime.getTime() + 1000 * 60);
try {
producer.send(message);
} catch (Exception e) {
throw new UserSystemCouponException(1, "鍒涘缓璧犻�佷俊鎭け璐�");
}
-
+
return couponVO;
}
@@ -2183,25 +2017,19 @@
continue;
}
- // 娑堟伅鎺ㄩ��
- try {
- if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
- } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
- 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);
+
+ try { // 娑堟伅鎺ㄩ��
+ Long uid = userCoupon.getUid();
+ String source = userCoupon.getSource();
+ if (baseCoupon.getType() == CouponTypeEnum.freeCoupon || baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
+ userOtherMsgNotificationService.freeCouponEndMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "宸茶繃鏈�");
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
+ userOtherMsgNotificationService.freeCouponEndMsg(uid, "璧犻�佸厤鍗曞埜", source, 1, "宸茶繃鏈�");
+ } if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ userOtherMsgNotificationService.rewardCouponEndMsg(uid, source, 1, "宸茶繃鏈�");
}
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ e.printStackTrace();
}
}
}
@@ -2240,13 +2068,12 @@
// 浣跨敤璁板綍
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);
+ Long uid = userCoupon.getUid();
+ String source = userCoupon.getSource();
+ Date startTime = userCoupon.getStartTime();
+ if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())
+ || CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "浣跨敤閫�鍥�", startTime, endTime);
}
}
}
@@ -2302,38 +2129,36 @@
sendBackGiveCoupon(list);
}
-
@Override
- @RequestSerializableByKeyService(key = "#id")
+ @RequestSerializableByKeyService(key = "#couponId")
@Transactional(rollbackFor = Exception.class)
public void sendBackByGiveId(Long couponId) {
if (couponId == null)
return;
-
+
UserSystemCoupon userCoupon = userSystemCouponMapper.selectByPrimaryKey(couponId);
if (userCoupon == null)
return;
-
+
Integer state = userCoupon.getState();
if (state != UserSystemCoupon.STATE_IN_USE)
return;
-
+
UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByCouponId(couponId);
if (giveRecord == null)
return;
-
- if (giveRecord.getState() != null && giveRecord.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+
+ if (giveRecord.getState() != null && giveRecord.getState() != UserSystemCouponGiveRecord.STATE_INIT)
return;
-
+
// 鏇存柊璧犻�佽褰�
UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
updateRecord.setId(giveRecord.getId());
updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);
userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);
-
+
// 鍙ｄ护澶辨晥
tokenRecordService.invalidByCoupon(giveRecord.getId());
-
Date now = new Date();
Date endTime = userCoupon.getEndTime();
@@ -2371,31 +2196,24 @@
return;
// 閫�鍥炴秷鎭�
- String couponName = systemCoupon.getName();
- if (CouponTypeEnum.freeCouponGive == systemCoupon.getType()) {
- couponName = "鍏嶅崟鍒�";
+ Long uid = userCoupon.getUid();
+ String source = userCoupon.getSource();
+ CouponTypeEnum type = systemCoupon.getType();
+ if (CouponTypeEnum.freeCouponGive == type) {
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�",
+ userCoupon.getStartTime(), userCoupon.getEndTime());
} else if (CouponTypeEnum.rebatePercentCoupon == systemCoupon.getType()) {
- couponName = "濂栧姳鍒�";
+ userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�",
+ userCoupon.getStartTime(), userCoupon.getEndTime());
}
-
- 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(giveRecord.getGiveTime()));
- msgOther.setReturnTime(sd.format(new Date()));
- userOtherMsgNotificationService.tokenGiveMsg(giveRecord.getGiveUid(), beiZhu, msgOther);
}
-
-
+
@Override
public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
for (UserSystemCouponGiveRecord record : overdueList) {
- if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+ if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)
continue;
-
+
// 鏇存柊璧犻�佽褰�
UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
updateRecord.setId(record.getId());
@@ -2453,22 +2271,16 @@
continue;
// 閫�鍥炴秷鎭�
- String couponName = systemCoupon.getName();
- if (CouponTypeEnum.freeCouponGive == systemCoupon.getType()) {
- couponName = "鍏嶅崟鍒�";
+ Long uid = userCoupon.getUid();
+ String source = userCoupon.getSource();
+ CouponTypeEnum type = systemCoupon.getType();
+ if (CouponTypeEnum.freeCouponGive == type) {
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�",
+ userCoupon.getStartTime(), userCoupon.getEndTime());
} else if (CouponTypeEnum.rebatePercentCoupon == systemCoupon.getType()) {
- couponName = "濂栧姳鍒�";
+ userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�",
+ userCoupon.getStartTime(), userCoupon.getEndTime());
}
-
- 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);
}
}
@@ -2566,9 +2378,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source) {
- if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
+ if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
return;
-
+
UserSystemCoupon coupon = userSystemCouponMapper.getNeedActivateCouponByType(uid,
CouponTypeEnum.freeCoupon.name());
if (coupon == null)
@@ -2578,14 +2390,14 @@
UserSystemCouponActivate couponActivate = userSystemCouponActivateService.selectForUpdate(id);
if (couponActivate == null)
return;
-
+
// 楠岃瘉鍚岃鍗曟槸鍚﹀瓨鍦�
String key = orderNo + "_" + source;
String ordernos = couponActivate.getOrdernos();
if (!StringUtil.isNullOrEmpty(ordernos)) {
String[] array = ordernos.split(",");
if (array != null)
- for (int i= 0; i < array.length; i ++) {
+ for (int i = 0; i < array.length; i++) {
if (array[i].equals(key))
return;
}
@@ -2593,7 +2405,7 @@
// 婵�娲绘暟閲�
boolean result = false;
- int limitNum = Integer.parseInt(configService.get("free_coupon_activate_num"));
+ int limitNum = Integer.parseInt(configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey()));
Integer state = couponActivate.getState();
int count = couponActivate.getCount();
@@ -2608,7 +2420,7 @@
} else {
ordernos = ordernos + "," + key;
}
-
+
UserSystemCouponActivate updateActivate = new UserSystemCouponActivate();
updateActivate.setId(id);
updateActivate.setState(state);
@@ -2655,26 +2467,10 @@
executor.execute(new Runnable() {
@Override
public void run() {
- UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService
- .getByReceiveId(coupon.getId());
- if (giveRecord == null)
- return;
-
- Long giveUid = giveRecord.getGiveUid();
- UserInfo userInfo = userInfoService.selectByPKey(giveUid);
- 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() + "澶╁唴浜х敓" + limitNum + "绗斿凡鍒拌处杩斿埄璁㈠崟");
- msgOther.setGiveUser("鏄电О锛�" + userInfo.getNickName() + " ID锛�" + giveUid);
- msgOther.setReceiveTime(sd.format(giveRecord.getReceiveTime()));
- msgOther.setValidityTime(expiryDay + "澶�");
- userOtherMsgNotificationService.giveCouponActivateMsg(coupon.getUid(), beiZhu, msgOther);
+ Long uid = coupon.getUid();
+ String source = coupon.getSource();
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1,
+ "婵�娲绘垚鍔�", nowDate, endTime);
}
});
} catch (Exception e) {
@@ -2682,4 +2478,5 @@
LogHelper.errorDetailInfo(e);
}
}
+
}
--
Gitblit v1.8.0