From 2a93320d3adf8c72ea127df59d0bdd043917dd79 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 十一月 2019 15:12:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 1201 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 737 insertions(+), 464 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 bcd4059..6c85258 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
@@ -12,16 +12,28 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.core.task.TaskExecutor;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.entity.DateInfo;
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
+import com.aliyun.openservices.ons.api.SendResult;
+import com.aliyun.openservices.ons.api.transaction.LocalTransactionExecuter;
+import com.aliyun.openservices.ons.api.transaction.TransactionProducer;
+import com.aliyun.openservices.ons.api.transaction.TransactionStatus;
+import com.google.gson.Gson;
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.DeviceLotteryRecord;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.TokenRecord;
@@ -29,6 +41,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
+import com.yeshi.fanli.entity.bus.user.UserSystemCouponActivate;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -43,31 +56,35 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.push.PushCouponRecordService;
import com.yeshi.fanli.service.inter.push.PushCouponService;
-import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponActivateService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
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.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.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.MQTopicName;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -90,7 +107,7 @@
@Resource
private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
-
+
@Resource
private ConfigService configService;
@@ -138,22 +155,32 @@
private UserOtherMsgNotificationService userOtherMsgNotificationService;
@Resource
- private DeviceLotteryRecordService deviceLotteryRecordService;
-
- @Resource
private CommonOrderCountService commonOrderCountService;
-
+
@Resource
@Lazy
private PushCouponService pushCouponService;
-
+
@Resource
private PushCouponRecordService pushCouponRecordService;
-
+
@Resource
private TokenRecordService tokenRecordService;
+
+ @Resource(name = "transactionManager")
+ private DataSourceTransactionManager transactionManager;
+
+ @Resource(name = "orderTransactionProducer")
+ private TransactionProducer orderTransactionProducer;
+
+ @Resource
+ private UserSystemCouponActivateService userSystemCouponActivateService;
+ @Resource(name = "producer")
+ private Producer producer;
+
+
@Override
public int insertSelective(UserSystemCoupon record) {
return userSystemCouponMapper.insertSelective(record);
@@ -183,17 +210,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);
@@ -201,16 +228,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())) {
@@ -218,11 +246,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, "鍒哥被鍨嬩笉姝ｇ‘");
}
@@ -240,16 +268,19 @@
}
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");
+ 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();
@@ -262,8 +293,11 @@
userCoupon.setEndTime(endTime);
userCoupon.setCreateTime(new Date());
userCoupon.setUpdateTime(new Date());
- // 鎻掑叆鏁版嵁搴�
- insertSelective(userCoupon);
+ userSystemCouponMapper.insertSelective(userCoupon);
+
+ if(coupon.getType() == CouponTypeEnum.freeCoupon) {
+ userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
+ }
executor.execute(new Runnable() {
@Override
@@ -288,23 +322,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;
}
@@ -319,10 +355,10 @@
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getCouponListOld(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
@@ -346,7 +382,7 @@
if (userInfoExtra != null) {
inviteCode = userInfoExtra.getInviteCode();
}
-
+
for (UserSystemCouponVO userCouponVO : listVO) {
SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
@@ -388,7 +424,7 @@
}
jumpBtn = new HashMap<String, Object>();
-
+
// 绂忓埄鍒搁渶瑕佹縺娲荤晫闈�
if (!changeJump) {
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
@@ -401,7 +437,7 @@
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
}
}
-
+
} else if (stateActivated == 1) {
// 鏄剧ず瑙勫垯
userCouponVO.setCouponRule(systemCoupon.getRule());
@@ -502,7 +538,7 @@
if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
source = "澶╁ぉ鎶�";
}
-
+
userCouponVO.setSource("鏉ユ簮锛�" + source);
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
@@ -550,7 +586,6 @@
return listVO;
}
-
/**
* 鏄惁瀛樺湪濂栧姳鍒�
*
@@ -578,14 +613,14 @@
@Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
-
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -613,10 +648,10 @@
// 杩囨湡鍒�
updateInvalidSate(uid);
-
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
if (couponList == null || couponList.size() == 0) {
@@ -624,7 +659,7 @@
}
List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
-
+
// 鑾峰彇鍟嗗搧璇︽儏
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
if (taoBaoGoodsBrief != null) {
@@ -650,9 +685,44 @@
return list;
}
+ @Override
+ 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)
+ 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, "鐢ㄦ埛鏈櫥褰�");
}
@@ -665,7 +735,7 @@
if (userSystemCoupon == null) {
throw new UserSystemCouponException(1, "鍒告暟鎹笉姝ｇ‘");
}
-
+
if (userSystemCoupon.getUid().longValue() != uid) {
throw new UserSystemCouponException(1, "涓嶅睘浜庤鐢ㄦ埛鐨勫埜");
}
@@ -728,53 +798,79 @@
@Transactional
@Override
- public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) throws UserSystemCouponException, Exception {
-
- if (id == null) {
+ public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData)
+ throws UserSystemCouponException, Exception {
+ if (id == null)
throw new UserSystemCouponException(1, "鍒竔d涓嶅瓨鍦�");
- }
-
- if (sourceType == null) {
+
+ if (sourceType == null)
sourceType = Constant.SOURCE_TYPE_TAOBAO;
- }
-
+
// 鐢ㄦ埛鍒�
UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id);
- if (userSystemCoupon == null) {
+ if (userSystemCoupon == null)
throw new UserSystemCouponException(1, "鍒镐俊鎭笉瀛樺湪");
- }
- if (userSystemCoupon.getUid().longValue() != uid) {
+ if (userSystemCoupon.getUid().longValue() != uid)
throw new UserSystemCouponException(1, "涓嶅睘浜庤鐢ㄦ埛鐨勫埜");
- }
Integer state = userSystemCoupon.getState();
Integer stateActivated = userSystemCoupon.getStateActivated();
- if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated) {
+ if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated)
throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�");
- }
// 绯荤粺鍒镐俊鎭�
SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
if (systemCoupon != null && systemCoupon.getId() != null) {
systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
- if (systemCoupon == null) {
+ if (systemCoupon == null)
throw new UserSystemCouponException(1, "鍒稿凡涓嶅瓨鍦�");
- }
}
- if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon)
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
- }
- if (orderNo == null || orderNo.trim().length() == 0) {
+ if (orderNo == null || orderNo.trim().length() == 0)
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
- }
// 璁㈠崟
- CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS, sourceType);
- if (orderVO == null) {
+ CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS,
+ sourceType);
+ if (orderVO == null)
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
+
+ // 鐗堟湰鍖哄垎锛�2.0.2
+ if (VersionUtil.greaterThan_2_0_2(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, "璇ヨ鍗曞凡涓嶈兘浣跨敤浣跨敤濂栧姳鍒革紝璇︽儏璇峰挩璇㈠鏈�");
+ }
+ }
+ }
}
BigDecimal hongBao = orderVO.getHongBao();
@@ -788,7 +884,7 @@
Order order = orderService.findOrderByOrderIdAndType(orderNo, sourceType);
if (order == null)
- return;
+ throw new UserSystemCouponException(1, "璇ヨ鍗曚笉瀛樺湪");
/* 濂栭噾璁＄畻 浠ュ強鐩稿叧绾㈠寘淇℃伅澶勭悊 */
@@ -797,6 +893,37 @@
// 鎻愭垚閲戦
BigDecimal money = MoneyBigDecimalUtil.mul(hongBao, percent);
+ UserSystemCouponUseMQMsg mqMsg = new UserSystemCouponUseMQMsg(userSystemCoupon.getId(), order.getOrderId(),
+ sourceType, systemCoupon.getType().name());
+ // 浜嬪姟娑堟伅
+ Message msg = new Message(MQTopicName.TOPIC_USER.name(), UserTopicTagEnum.useSystemCoupon.name(),
+ new Gson().toJson(mqMsg).getBytes());
+ 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;
+ }
+ }
+ }
+
+ @Transactional
+ public void useRewardCouponCore(UserSystemCoupon userSystemCoupon, BigDecimal money, BigDecimal hongBao, Long uid,
+ Order order) throws Exception {
+ org.springframework.transaction.TransactionStatus transactionStatus = transactionManager
+ .getTransaction(new DefaultTransactionDefinition());
+ try {
// 1銆佹彃鍏ョ孩鍖呮暟鎹�
HongBaoV2 hongBaoV2 = new HongBaoV2();
hongBaoV2.setMoney(money);
@@ -808,21 +935,17 @@
hongBaoV2.setUserInfo(new UserInfo(uid));
hongBaoV2.setPreGetTime(new Date());
hongBaoV2.setGetTime(new Date());
-
+
hongBaoV2Service.insertSelective(hongBaoV2);
// 2.鎻掑叆鍏宠仈
orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
// 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, sourceType, money,
- new UserInfo(uid));
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(order.getOrderId(),
+ order.getOrderType(), money, new UserInfo(uid));
userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
userInfoService.addMoney(new UserInfo(uid), money);
-
- // 鎻掑叆璧勯噾閫氱煡
- userMoneyMsgNotificationService.orderReward(uid, orderNo, sourceType, money,
- userInfoService.selectByPKey(uid).getMyHongBao());
/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
@@ -833,29 +956,40 @@
userSystemCoupon.setUpdateTime(date);
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+ SystemCoupon coupon = systemCouponService.selectByPrimaryKey(userSystemCoupon.getSystemCoupon().getId());
+
// 鎻掑叆浣跨敤鍒歌褰�
UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);
- couponRecord.setGoodSource(sourceType);
- couponRecord.setOrderNo(orderNo);
+ couponRecord.setGoodSource(order.getOrderType());
+ couponRecord.setOrderNo(order.getOrderId());
couponRecord.setUserSystemCoupon(userSystemCoupon);
- couponRecord.setCouponType(systemCoupon.getType().name());
+ couponRecord.setCouponType(coupon.getType().name());
couponRecord.setCreateTime(date);
couponRecord.setUpdateTime(date);
userSystemCouponRecordService.insertSelective(couponRecord);
+ // 鎻掑叆璧勯噾閫氱煡
+ userMoneyMsgNotificationService.orderReward(uid, order.getOrderId(), order.getOrderType(), money,
+ userInfoService.selectByPKey(uid).getMyHongBao());
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
+ userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, order.getOrderId());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
+ transactionManager.commit(transactionStatus);
+ } catch (Exception e) {
+ e.printStackTrace();
+ transactionManager.rollback(transactionStatus);
+ throw new Exception();
}
}
@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, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -933,7 +1067,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, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -961,7 +1096,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, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
@@ -1231,7 +1367,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);
}
}
@@ -1239,8 +1376,7 @@
public List<UserSystemCoupon> getCounponNowInvalid(int count) {
return userSystemCouponMapper.getCounponNowInvalid(count);
}
-
-
+
@Transactional
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
@@ -1311,7 +1447,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);
}
}
}
@@ -1319,143 +1456,115 @@
return isfree;
}
-
-
@Override
@Transactional
public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
- if (uid == null || device == null) {
- return;
- }
+ 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");
- 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);
+ /*
+ * 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);
+ 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");
+ 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);
@@ -1468,11 +1577,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) {
@@ -1480,7 +1589,7 @@
}
}
}
-
+
// 绂忓埄涓績绾㈢偣
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null) {
@@ -1494,15 +1603,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));
@@ -1523,40 +1645,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, "鍙傛暟涓嶆纭�");
}
@@ -1567,7 +1690,7 @@
} else {
coupon = systemCouponService.getCouponByType(couponType);
}
-
+
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
@@ -1575,22 +1698,24 @@
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");
+ 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();
@@ -1604,26 +1729,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)
+ public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, 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;
@@ -1650,7 +1773,7 @@
if (source != null && "濂栧姳鍒稿ぉ澶╂娊".equals(source)) {
source = "澶╁ぉ鎶�";
}
-
+
userCouponVO.setSource("鏉ユ簮锛�" + source);
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
@@ -1707,15 +1830,13 @@
listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
userCouponVO.setTips(listTip);
userCouponVO.setPopup(true);
-
- // 楠岃瘉鏄惁宸茬疮璁�3鍗�
- executor.execute(new Runnable() {
- @Override
- public void run() {
- freeCouponActivate(userCouponVO.getId(), uid, userCouponVO.getCreateTime());
- }
- });
-
+ // 缁熻寰呮縺娲绘暟閲�
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
+ String activateNum = configService.get("free_coupon_activate_num");
+ userCouponVO.setCouponEffect(
+ "(" + activateCount + "/" + Integer.parseInt(activateNum) + ")寰呮縺娲�");
+ }
} else if (CouponTypeEnum.welfareFreeCoupon == type) {
jumpBtn = new HashMap<String, Object>();
if (inviteCode != null && inviteCode.trim().length() > 0) {
@@ -1724,7 +1845,7 @@
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
}
}
- }
+ }
}
if (UserSystemCoupon.STATE_IN_USE == state && (CouponTypeEnum.freeCouponBuy == type
@@ -1741,9 +1862,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) {
@@ -1760,7 +1881,8 @@
// 璁㈠崟鍒楄〃
jumpLink.put("state", "2"); // 宸叉敹璐�
- jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
+ jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
+ jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
jumpLink.put("title", "杩斿埄璁㈠崟"); // 鏍囬鍚�
jumpLink.put("goodsType", "0"); // 璁㈠崟鏉ユ簮
jumpBtn = new HashMap<String, Object>();
@@ -1771,33 +1893,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_free_coupon_tips");
+ 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>();
@@ -1805,21 +1930,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>();
@@ -1836,79 +1961,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();
@@ -1917,28 +2040,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);
@@ -1947,18 +2070,30 @@
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"));
+
+ UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
- return createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
+ UserSystemCouponUseMQMsg msg = new UserSystemCouponUseMQMsg();
+ msg.setUserSystemCouponId(id);
+ msg.setCouponType(type.name());
+ Message message = new Message(MQTopicName.TOPIC_USER.name(), UserTopicTagEnum.systemCouponDrawback.name(),
+ new Gson().toJson(msg).getBytes());
+ try {
+ producer.send(message);
+ } catch (Exception e) {
+ throw new UserSystemCouponException(1, "鍒涘缓璧犻�佷俊鎭け璐�");
+ }
+
+ return couponVO;
}
-
-
- 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());
@@ -1971,7 +2106,7 @@
userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
userCouponVO.setCouponPicture(systemCoupon.getPicture());
userCouponVO.setGiveTips(tips);
-
+
String couponTerm = "鏈夋晥鏈燂細";
Date startTime = userCouponVO.getStartTime();
Date endTime = userCouponVO.getEndTime();
@@ -1980,90 +2115,15 @@
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) {
- 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();
- String endDay = DateUtil.plusDay(expiryDay - 1, nowDate);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- Date endTime = format.parse(endDay);
-
- UserSystemCoupon userCoupon = new UserSystemCoupon();
- userCoupon.setId(coupon.getId());
- userCoupon.setStateActivated(1);
- userCoupon.setEndTime(endTime);
- userCoupon.setStartTime(nowDate);
- userCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
-
- // 璧犻�佽褰�
- UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByReceiveId(id);
- 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() +"澶╁唴浜х敓"+ num +"绗斿凡鍒拌处杩斿埄璁㈠崟");
- msgOther.setGiveUser("鏄电О锛�"+ userInfo.getNickName() +" ID锛�" + giveUid);
- msgOther.setReceiveTime(sd.format(giveRecord.getReceiveTime()));
- msgOther.setValidityTime(expiryDay + "澶�");
- userOtherMsgNotificationService.giveCouponActivateMsg(uid, beiZhu, msgOther);
- } catch (Exception e) {
- e.printStackTrace();
- LogHelper.errorDetailInfo(e);
- }
- }
- }
-
-
@Transactional
@Override
public void updateInvalidSate(Long uid) {
@@ -2073,8 +2133,7 @@
}
updateCounponInvalid(list);
}
-
-
+
@Override
public void updateCounponInvalid(List<UserSystemCoupon> list) {
if (list == null || list.size() == 0) {
@@ -2091,7 +2150,7 @@
if (baseCoupon == null) {
continue;
}
-
+
baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
if (baseCoupon == null || baseCoupon.getId() == null) {
continue;
@@ -2105,7 +2164,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);
@@ -2119,8 +2178,7 @@
}
}
}
-
-
+
/**
* 閫�鍥炲埜 鍒濆鏁版嵁
*
@@ -2129,11 +2187,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()) {
@@ -2143,7 +2201,7 @@
updateCounponInvalid(list);
return;
}
-
+
// 閫�鍥炲埜
UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
userSystemCoupon.setId(userCoupon.getId());
@@ -2152,20 +2210,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
@@ -2177,11 +2235,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;
@@ -2195,7 +2253,7 @@
userSystemCoupon.setUseTime(null);
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
+
UserSystemCouponRecord record = userSystemCouponRecordService.getNearByUserCouponId(userCoupon.getId());
if (record != null) {
UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
@@ -2207,41 +2265,131 @@
}
}
-
@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
+ @RequestSerializableByKeyService(key = "#id")
+ @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)
+ 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();
+ if (endTime != null && endTime.getTime() < now.getTime()) {
+ List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
+ list.add(userCoupon);
+ updateCounponInvalid(list);
+ return;
+ }
+
+ // 閫�鍥炲埜
+ 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.updateByPrimaryKeySelective(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)
+ return;
+
+ // 閫�鍥炴秷鎭�
+ String couponName = systemCoupon.getName();
+ if (CouponTypeEnum.freeCouponGive == systemCoupon.getType()) {
+ couponName = "鍏嶅崟鍒�";
+ } 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.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) {
+ for (UserSystemCouponGiveRecord record : overdueList) {
+ if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+ continue;
+
// 鏇存柊璧犻�佽褰�
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()) {
@@ -2250,7 +2398,7 @@
updateCounponInvalid(list);
continue;
}
-
+
// 閫�鍥炲埜
UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
userSystemCoupon.setId(userCoupon.getId());
@@ -2259,25 +2407,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()) {
@@ -2285,63 +2432,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;
@@ -2350,14 +2497,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());
@@ -2404,4 +2551,130 @@
return listCoupon;
}
+
+ @Override
+ public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
+ return userSystemCouponMapper.getFreeCouponByType(uid, type);
+ }
+
+ @RequestSerializableByKeyService(key = "#uid")
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source) {
+ if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
+ return;
+
+ UserSystemCoupon coupon = userSystemCouponMapper.getNeedActivateCouponByType(uid,
+ CouponTypeEnum.freeCoupon.name());
+ if (coupon == null)
+ return;
+
+ Long id = coupon.getId();
+ 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 ++) {
+ if (array[i].equals(key))
+ return;
+ }
+ }
+
+ // 婵�娲绘暟閲�
+ boolean result = false;
+ int limitNum = Integer.parseInt(configService.get("free_coupon_activate_num"));
+
+ Integer state = couponActivate.getState();
+ int count = couponActivate.getCount();
+ count++;
+ if (count >= limitNum) {
+ result = true;
+ state = UserSystemCouponActivate.STATE_END;
+ }
+
+ if (StringUtil.isNullOrEmpty(ordernos)) {
+ ordernos = key;
+ } else {
+ ordernos = ordernos + "," + key;
+ }
+
+ UserSystemCouponActivate updateActivate = new UserSystemCouponActivate();
+ updateActivate.setId(id);
+ updateActivate.setState(state);
+ updateActivate.setCount(count);
+ updateActivate.setOrdernos(ordernos);
+ updateActivate.setUpdateTime(new Date());
+ userSystemCouponActivateService.updateByPrimaryKeySelective(updateActivate);
+
+ // 婵�娲诲鍔卞埜
+ if (result) {
+ activateFreeCoupon(coupon, limitNum);
+ }
+ }
+
+ /**
+ * 婵�娲诲埜
+ *
+ * @param coupon
+ * @param activateNum
+ */
+ @Transactional
+ private void activateFreeCoupon(UserSystemCoupon coupon, int limitNum) {
+ try {
+ Date nowDate = new Date();
+ SystemCoupon systemCoupon = coupon.getSystemCoupon();
+
+ 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);
+ userCoupon.setEndTime(endTime);
+ userCoupon.setStartTime(nowDate);
+ userCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
+
+ // 娑堟伅
+ 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);
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ }
+ }
}
--
Gitblit v1.8.0