From 89cc8f054c27f70fcfe16f14554a8a12e0c19e23 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期三, 18 十二月 2019 09:22:31 +0800 Subject: [PATCH] 邀请统计 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 170 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 87 insertions(+), 83 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 90c43a0..c9f73e0 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 @@ -49,7 +49,6 @@ import com.yeshi.fanli.entity.system.SystemCoupon; import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; -import com.yeshi.fanli.exception.user.UserInfoExtraException; import com.yeshi.fanli.exception.user.UserSystemCouponException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.common.JumpDetailV2Service; @@ -79,6 +78,7 @@ import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; +import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.TokenUtil; import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService; @@ -155,6 +155,7 @@ @Resource private UserOtherMsgNotificationService userOtherMsgNotificationService; + @Lazy @Resource private CommonOrderCountService commonOrderCountService; @@ -179,7 +180,7 @@ @Resource(name = "producer") private Producer producer; - + @Resource private UserVIPInfoService userVIPInfoService; @@ -251,6 +252,8 @@ } else { coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent); } + } else if (couponType.equals(CouponTypeEnum.freeCouponGive.name())) { + coupon = systemCouponService.getCouponByType(couponType); } if (coupon == null) { @@ -303,23 +306,18 @@ executor.execute(new Runnable() { @Override - public void run() { - UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); - // 娣诲姞涓�鏉℃秷鎭� - if (userInfoExtra != null) { - if (userInfoExtra.getCouponNews() == null) { - userInfoExtra.setCouponNews(1); + public void run() { // 绂忓埄涓績绾㈢偣 + UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid); + if (extra != null) { + UserInfoExtra updateExtra = new UserInfoExtra(); + updateExtra.setId(extra.getId()); + if (extra.getCouponNews() == null) { + updateExtra.setCouponNews(1); } else { - userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1); + updateExtra.setCouponNews(extra.getCouponNews() + 1); } - - try { - userInfoExtraService.saveUserInfoExtra(userInfoExtra); - } catch (UserInfoExtraException e) { - e.printStackTrace(); - } + userInfoExtraService.updateByPrimaryKeySelective(updateExtra); } - } }); @@ -703,6 +701,26 @@ return userSystemCouponMapper.countUsableByUid(uid, listCouponId); } + + + @Override + public long countGiveFreeCoupon(Long uid) { + if (uid == null) + return 0; + + List<SystemCoupon> couponList = systemCouponService.getGiveFreeCouponList(); + 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) { @@ -721,7 +739,7 @@ return userSystemCouponMapper.countUsableByUid(uid, listCouponId); } - @Transactional + @Transactional(rollbackFor = Exception.class) @Override public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception { @@ -798,7 +816,7 @@ } - @Transactional + @Transactional(rollbackFor = Exception.class) @Override public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData) throws UserSystemCouponException, Exception { @@ -851,44 +869,46 @@ throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝鍞悗缁存潈璁㈠崟涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳"); } + // 璁㈠崟 - CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS, - sourceType); - if (orderVO == null) - throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); + List<CommonOrderVO> listVo = commonOrderService.listGroupOrderNoByUid(0, 1, uid, 2, 1,1, orderNo, null, + null, null, sourceType); + if (listVo == null || listVo.size() == 0) + throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝璇ヨ鍗曞凡涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳"); + + CommonOrderVO orderVO = listVo.get(0); + + // 2.1鏂扮増 + Date thirdCreateTime = orderVO.getThirdCreateTime(); + Date accountTime = orderVO.getAccountTime(); + if (thirdCreateTime == null || accountTime == null) + throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜"); + + long downOrderTime = thirdCreateTime.getTime(); + long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME); + if (downOrderTime > limitDate) { + boolean valid = false; + Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime); + long currentTime = java.lang.System.currentTimeMillis(); + if (endDay.getTime() > currentTime) { + DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime()); + if (dateInfo != null) { + if (dateInfo.getDay() > 0) + valid = true; - // 鐗堟湰鍖哄垎锛�2.0.2 - if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) { - Date thirdCreateTime = orderVO.getThirdCreateTime(); - if (thirdCreateTime != null) { - long downOrderTime = thirdCreateTime.getTime(); - long limitDate = Long.parseLong("1573315200000"); // TODO - // 鏃ユ湡寰呯‘瀹�2019-11-10 - if (downOrderTime > limitDate) { - Date endDay = DateUtil.plusDayDate(4, thirdCreateTime); - long currentTime = java.lang.System.currentTimeMillis(); - if (endDay.getTime() > currentTime) { - boolean valid = false; - DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime()); - if (dateInfo != null) { - if (dateInfo.getDay() > 0) - valid = true; + if (!valid && dateInfo.getHour() > 0) + valid = true; - if (!valid && dateInfo.getHour() > 0) - valid = true; + if (!valid && dateInfo.getMinute() > 0) + valid = true; - if (!valid && dateInfo.getMinute() > 0) - valid = true; - - if (!valid && dateInfo.getSecond() >= 0) - valid = true; - } - - if (!valid) - throw new UserSystemCouponException(1, "璇ヨ鍗曞凡涓嶈兘浣跨敤浣跨敤濂栧姳鍒革紝璇︽儏璇峰挩璇㈠鏈�"); - } + if (!valid && dateInfo.getSecond() > 0) + valid = true; } } + + if (!valid) + throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜"); } BigDecimal hongBao = orderVO.getHongBao(); @@ -1612,13 +1632,16 @@ if (userInfoExtra == null) { return; } + + UserInfoExtra extra = new UserInfoExtra(); + extra.setId(userInfoExtra.getId()); Integer couponNews = userInfoExtra.getCouponNews(); if (couponNews == null) { - userInfoExtra.setCouponNews(num); + extra.setCouponNews(num); } else { - userInfoExtra.setCouponNews(couponNews + num); + extra.setCouponNews(couponNews + num); } - userInfoExtraService.saveUserInfoExtra(userInfoExtra); + userInfoExtraService.saveUserInfoExtra(extra); } @Override @@ -1997,7 +2020,7 @@ return listVO; } - @Transactional + @Transactional(rollbackFor = Exception.class) @Override public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException { UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id); @@ -2052,12 +2075,13 @@ } Date nowDate = new Date(); + Date endTime = DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate); // 鎻掑叆璧犻�佽褰� UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord(); giveRecord.setCouponId(id); giveRecord.setGiveUid(uid); giveRecord.setGiveTime(nowDate); - giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate)); + giveRecord.setEndTime(endTime); userSystemCouponGiveRecordService.insertSelective(giveRecord); // 鍒涘缓璁板綍 @@ -2066,7 +2090,7 @@ tokenRecord.setIdentify(giveRecord.getId() + ""); tokenRecord.setType(tokenTypeEnum); tokenRecord.setStartTime(nowDate); - tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, nowDate)); + tokenRecord.setEndTime(endTime); tokenRecord.setState(0); tokenRecordService.insertSelective(tokenRecord); @@ -2102,6 +2126,8 @@ msg.setUserSystemCouponId(id); msg.setCouponType(type.name()); Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback, msg); + // 寤惰繜涓�鍒嗛挓 + message.setStartDeliverTime(endTime.getTime() + 1000 * 60); try { producer.send(message); } catch (Exception e) { @@ -2294,7 +2320,7 @@ } @Override - @RequestSerializableByKeyService(key = "#id") + @RequestSerializableByKeyService(key = "#couponId") @Transactional(rollbackFor = Exception.class) public void sendBackByGiveId(Long couponId) { if (couponId == null) @@ -2461,34 +2487,16 @@ } @Override - public boolean getIncludeExchange(Long uid) { + public boolean getValidRebateCoupon(Long uid) { // 杩囨湡鍒� updateInvalidSate(uid); - - String percent = configService.get("exchange_rebate_percent"); - if (StringUtil.isNullOrEmpty(percent)) - percent = "35"; - List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, Integer.parseInt(percent), - CouponTypeEnum.rebatePercentCoupon.name()); + + List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, 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()); - if (listCoupon == null || listCoupon.size() == 0) - return false; - return true; - } @Override public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception { @@ -2498,12 +2506,8 @@ // 閫�鍥炲埜 sendBackTimeOutCoupon(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<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name()); if (listCoupon == null || listCoupon.size() == 0) return null; -- Gitblit v1.8.0