From f54093a69938aca18ca6ba005e17afe5ee5bbfe6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 24 九月 2019 16:40:35 +0800
Subject: [PATCH] oppo推送绑定
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 688 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 435 insertions(+), 253 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 43f8117..acd520b 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
@@ -10,15 +10,17 @@
import javax.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
+import com.yeshi.fanli.dto.msg.MsgOtherCouponActivateDTO;
import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
import com.yeshi.fanli.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;
@@ -40,25 +42,24 @@
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.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;
@@ -104,6 +105,7 @@
private UserSystemCouponRecordService userSystemCouponRecordService;
@Resource
+ @Lazy
private HongBaoV2Service hongBaoV2Service;
@Resource
@@ -134,12 +136,10 @@
private UserOtherMsgNotificationService userOtherMsgNotificationService;
@Resource
- private DeviceLotteryRecordService deviceLotteryRecordService;
-
- @Resource
private CommonOrderCountService commonOrderCountService;
@Resource
+ @Lazy
private PushCouponService pushCouponService;
@Resource
@@ -196,7 +196,7 @@
@Override
@Transactional
- public void insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent)
+ public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent)
throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
@@ -212,7 +212,7 @@
// 闅忔満濂栧姳鍒�
if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {
randomRewardCoupon(1, uid, source);
- return;
+ return null;
} else {
coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
}
@@ -244,7 +244,10 @@
// 缁撴潫鏃ユ湡
// 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
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();
@@ -299,6 +302,8 @@
e1.printStackTrace();
}
}
+
+ return userCoupon;
}
@Transactional
@@ -310,6 +315,9 @@
return null;
}
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -573,6 +581,9 @@
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -598,6 +609,9 @@
throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
}
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
@@ -633,7 +647,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 {
@@ -898,7 +949,7 @@
userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%");
// 璧勯噾鏄庣粏
- JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");
+ JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("moneyDetails");
Map<String, Object> jumpWelfare = new HashMap<String, Object>();
jumpWelfare.put("jumpDetail", welfareCore);
Map<String, Object> jumpparms = new HashMap<String, Object>();
@@ -1224,76 +1275,7 @@
return userSystemCouponMapper.getCounponNowInvalid(count);
}
-
- @Override
- public void updateCounponInvalid(List<UserSystemCoupon> list) {
- if (list == null || list.size() == 0) {
- return;
- }
-
- for (UserSystemCoupon userSystemCoupon : list) {
- UserSystemCoupon userCoupon = new UserSystemCoupon();
- userCoupon.setUpdateTime(new Date());
- userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
- userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
- SystemCoupon baseCoupon = userSystemCoupon.getSystemCoupon();
- if (baseCoupon == null) {
- continue;
- }
-
- baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
- if (baseCoupon == null || baseCoupon.getId() == null) {
- 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);
- }
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
- }
- }
-
- @Transactional
- @Override
- public void sendBackTimeOutCoupon(Long uid) {
- // 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫埜
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 600L);
- if (list == null || list.size() == 0) {
- return;
- }
-
- for (UserSystemCouponRecord couponRecord : list) {
- // 鏇存柊鐘舵�侊細鍖归厤瓒呮椂
- couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
- couponRecord.setUpdateTime(new Date());
- userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
-
- UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
- // 鐘舵�佸垵濮嬪寲
- userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- userSystemCoupon.setUseTime(null);
- userSystemCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
- }
- }
-
+
@Transactional
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
@@ -1372,165 +1354,84 @@
return isfree;
}
- /**
- * 閫�鍥炲埜 鍒濆鏁版嵁
- *
- * @param userSystemCoupon
- */
- public void sendBackCoupon(UserSystemCoupon userCoupon, UserSystemCouponRecord record) throws Exception {
- if (userCoupon == null)
- return;
-
- Integer state = userCoupon.getState();
- if (state != UserSystemCoupon.STATE_IN_USE)
- return;
-
- Date now = new Date();
- Date endTime = userCoupon.getEndTime();
- if (endTime != null && endTime.getTime() < now.getTime()) {
- // 杩囨湡
- List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
- list.add(userCoupon);
- updateCounponInvalid(list);
- return;
- }
-
- // 閫�鍥炲埜
- UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
- userSystemCoupon.setId(userCoupon.getId());
- userSystemCoupon.setGive(false);
- userSystemCoupon.setUseTime(null);
- userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- userSystemCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
-
- // 浣跨敤璁板綍
- if (record != null) {
- UserSystemCouponRecord useRecordUpdate = new UserSystemCouponRecord();
- useRecordUpdate.setId(record.getId());
- useRecordUpdate.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
- useRecordUpdate.setUpdateTime(new Date());
- userSystemCouponRecordService.updateByPrimaryKeySelective(useRecordUpdate);
-
- if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
- userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());
- } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
- userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());
- } else if (CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
- userOtherMsgNotificationService.couponDrawBack(userSystemCoupon, record.getOrderNo(), MsgTypeOtherTypeEnum.freeCouponBuy);
- }
- }
-
- }
+
@Override
@Transactional
public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
- 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");
- 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);
+ 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);
+ */
}
@@ -1555,7 +1456,10 @@
// 缁撴潫鏃ユ湡 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
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();
@@ -1692,7 +1596,10 @@
// 璁＄畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶�
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();
@@ -1715,9 +1622,17 @@
@Override
public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
+
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
+ // 璧犻�佺殑閫�鍥�
+ sendBackGiveUser(uid);
+
+
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
@@ -1801,6 +1716,15 @@
listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
userCouponVO.setTips(listTip);
userCouponVO.setPopup(true);
+
+ // 楠岃瘉鏄惁宸茬疮璁�3鍗�
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ freeCouponActivate(userCouponVO.getId(), uid, userCouponVO.getCreateTime());
+ }
+ });
+
} else if (CouponTypeEnum.welfareFreeCoupon == type) {
jumpBtn = new HashMap<String, Object>();
if (inviteCode != null && inviteCode.trim().length() > 0) {
@@ -1814,7 +1738,11 @@
if (UserSystemCoupon.STATE_IN_USE == state && (CouponTypeEnum.freeCouponBuy == type
|| CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type)) {
- userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+ List<String> listTip = new ArrayList<String>();
+ listTip.add("绯荤粺姝ｅ湪鍒ゆ柇鏄惁绗﹀悎鍏嶅崟闇�姹傦紱");
+ listTip.add("绯荤粺姝ｅ湪鍚屾娣樺疂璁㈠崟锛�");
+ listTip.add("鏈娇鐢ㄦ垚鍔熺殑鍏嶅崟鍒镐細鍘熻矾閫�鍥炪��");
+ userCouponVO.setTipsUsing(listTip);
}
// 鏄惁宸茶禒閫�
@@ -1839,9 +1767,12 @@
// 鍙娇鐢ㄣ�� 鍙禒閫�
userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
- // 杩斿埄濂栧姳鍒�- 璺宠浆鑷冲凡鍒拌处-宸叉敹璐�
- jumpLink.put("state", "2");
- jumpLink.put("type", "1");
+ // 璁㈠崟鍒楄〃
+ jumpLink.put("state", "2"); // 宸叉敹璐�
+ jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
+ jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
+ jumpLink.put("title", "杩斿埄璁㈠崟"); // 鏍囬鍚�
+ jumpLink.put("goodsType", "0"); // 璁㈠崟鏉ユ簮
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("order_screen_list"));
@@ -1860,7 +1791,7 @@
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;
}
@@ -1889,9 +1820,9 @@
} else if (UserSystemCoupon.STATE_END_USE == state) {
if (give) {
- userCouponVO.setCouponEffect("浠绘��0鍏冭喘");
userCouponVO.setCouponRule(systemCoupon.getRemark());
if (CouponTypeEnum.freeCouponGive == type) {
+ userCouponVO.setCouponEffect("浠绘��0鍏冭喘");
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
}
@@ -1902,7 +1833,7 @@
Date useTime = userCouponVO.getUseTime();
if (useTime != null) {
Map<String, Object> remainDays = new HashMap<String, Object>();
- remainDays.put("content", "浜�" + sdf.format(useTime) + "鎴愬姛璧犻��");
+ remainDays.put("content", "浜�" + sdf.format(useTime) + "璧犻��");
remainDays.put("fontColor", "#CCCCCC");
userCouponVO.setRemainDays(remainDays);
}
@@ -1910,7 +1841,7 @@
Date useTime = userCouponVO.getUseTime();
if (useTime != null) {
Map<String, Object> remainDays = new HashMap<String, Object>();
- remainDays.put("content", "浜�" + sdf.format(useTime) + "鎴愬姛浣跨敤");
+ remainDays.put("content", "浜�" + sdf.format(useTime) + "浣跨敤");
remainDays.put("fontColor", "#CCCCCC");
userCouponVO.setRemainDays(remainDays);
}
@@ -2069,6 +2000,237 @@
}
+ /**
+ * 鍏嶅崟鍒告縺娲�
+ * @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 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);
+
+ // 璧犻�佽褰�
+ 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) {
+ List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalidByUid(uid);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ updateCounponInvalid(list);
+ }
+
+
+ @Override
+ public void updateCounponInvalid(List<UserSystemCoupon> list) {
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ for (UserSystemCoupon userSystemCoupon : list) {
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setUpdateTime(new Date());
+ userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+ SystemCoupon baseCoupon = userSystemCoupon.getSystemCoupon();
+ if (baseCoupon == null) {
+ continue;
+ }
+
+ baseCoupon = systemCouponService.selectByPrimaryKey(baseCoupon.getId());
+ if (baseCoupon == null || baseCoupon.getId() == null) {
+ 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);
+ }
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 閫�鍥炲埜 鍒濆鏁版嵁
+ *
+ * @param userSystemCoupon
+ */
+ public void sendBackCoupon(UserSystemCoupon userCoupon, UserSystemCouponRecord record) throws Exception {
+ if (userCoupon == null)
+ return;
+
+ Integer state = userCoupon.getState();
+ if (state != UserSystemCoupon.STATE_IN_USE)
+ return;
+
+ Date now = new Date();
+ Date endTime = userCoupon.getEndTime();
+ if (endTime != null && endTime.getTime() < now.getTime()) {
+ // 杩囨湡
+ List<UserSystemCoupon> list = new ArrayList<UserSystemCoupon>();
+ list.add(userCoupon);
+ updateCounponInvalid(list);
+ return;
+ }
+
+ // 閫�鍥炲埜
+ 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);
+
+ // 浣跨敤璁板綍
+ 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);
+ }
+ }
+ }
+
+
+ @Async()
+ @Transactional
+ @Override
+ public void sendBackTimeOutCoupon(Long uid) {
+ // 鍟嗗搧鐩稿叧鐨勫埜
+ List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
+ if (couponList == null || couponList.size() == 0) {
+ return;
+ }
+
+ List<Long> list = new ArrayList<Long>();
+ for (SystemCoupon systemCoupon: couponList) {
+ list.add(systemCoupon.getId());
+ }
+
+ // 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫厤鍗曞埜
+ List<UserSystemCoupon> listUserCoupon = userSystemCouponMapper.getCouponByUsingTimeOut(uid, list, 600L);
+ if (listUserCoupon == null || listUserCoupon.size() == 0) {
+ return;
+ }
+
+ for (UserSystemCoupon userCoupon : listUserCoupon) {
+ // 鐘舵�佸垵濮嬪寲
+ UserSystemCoupon userSystemCoupon = new UserSystemCoupon();
+ userSystemCoupon.setId(userCoupon.getId());
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userSystemCoupon.setUseTime(null);
+ userSystemCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+ UserSystemCouponRecord record = userSystemCouponRecordService.getNearByUserCouponId(userCoupon.getId());
+ if (record != null) {
+ UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
+ couponRecord.setId(record.getId());
+ couponRecord.setUpdateTime(new Date());
+ couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
+ }
+ }
+ }
+
+
+ @Transactional
+ @Override
+ public void sendBackGiveUser(Long uid) {
+ List<UserSystemCouponGiveRecord> list =userSystemCouponGiveRecordService.overdueListByUser(uid);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ sendBackGiveCoupon(list);
+ }
+
@Override
public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
for (UserSystemCouponGiveRecord record: overdueList) {
@@ -2109,7 +2271,7 @@
userSystemCoupon.setUseTime(null);
userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
userSystemCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
// 浣跨敤璁板綍
UserSystemCouponRecord useRecord = userSystemCouponRecordService.getNearByUserCouponId(couponId);
@@ -2128,16 +2290,20 @@
if (systemCoupon == null)
continue;
- String couponName = systemCoupon.getName();
- if (CouponTypeEnum.freeCouponGive == systemCoupon.getType())
- couponName = "鍏嶅崟鍒�";
// 閫�鍥炴秷鎭�
+ 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.setTitle(couponName + "閫�鍥�");
msgOther.setGiveType("浣犺禒閫佺殑"+ couponName + "鏈鎴愬姛棰嗗彇");
msgOther.setGiveTime(sd.format(record.getGiveTime()));
msgOther.setReturnTime(sd.format(new Date()));
@@ -2148,6 +2314,9 @@
@Override
public boolean getIncludeExchange(Long uid) {
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
String percent = configService.get("exchange_rebate_percent");
if (StringUtil.isNullOrEmpty(percent))
percent = "35";
@@ -2160,6 +2329,9 @@
@Override
public boolean getIncludeNotExchange(Long uid) {
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
String percent = configService.get("exchange_rebate_percent");
if (StringUtil.isNullOrEmpty(percent))
percent = "35";
@@ -2172,6 +2344,10 @@
@Override
public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception{
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
+ // 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
String percent = configService.get("exchange_rebate_percent");
@@ -2241,4 +2417,10 @@
return listCoupon;
}
+
+
+ @Override
+ public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {
+ return userSystemCouponMapper.getFreeCouponByType(uid, type);
+ }
}
--
Gitblit v1.8.0