From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期三, 27 三月 2019 12:17:33 +0800 Subject: [PATCH] 主分类 + 子分类 DAO改造 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 811 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 626 insertions(+), 185 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 12563d1..d20e351 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 @@ -17,6 +17,7 @@ import org.yeshi.utils.DateUtil; import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper; +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.UserInfo; @@ -26,8 +27,11 @@ import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.entity.money.UserMoneyDetail; import com.yeshi.fanli.entity.order.CommonOrder; +import com.yeshi.fanli.entity.push.PushCoupon; +import com.yeshi.fanli.entity.push.PushCouponRecord; 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; @@ -38,10 +42,14 @@ import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.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.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.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.service.inter.user.UserMoneyDetailService; @@ -49,7 +57,9 @@ import com.yeshi.fanli.service.inter.user.UserSystemCouponService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; +import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.factory.UserMoneyDetailFactory; +import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.order.CommonOrderVO; import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO; @@ -62,7 +72,10 @@ @Resource(name = "taskExecutor") private TaskExecutor executor; - + + @Resource + private RedisManager redisManager; + @Resource private UserSystemCouponMapper userSystemCouponMapper; @@ -101,20 +114,29 @@ @Resource private UserMoneyMsgNotificationService userMoneyMsgNotificationService; - + @Resource private UserInfoExtraService userInfoExtraService; - + @Resource private ThreeSaleSerivce threeSaleSerivce; - + @Resource private UserOtherMsgNotificationService userOtherMsgNotificationService; + + @Resource + private DeviceLotteryRecordService deviceLotteryRecordService; + + @Resource + private CommonOrderCountService commonOrderCountService; - - // 鍒稿け鏁堝浘鐗� - public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png"; - + @Resource + private PushCouponService pushCouponService; + + @Resource + private PushCouponRecordService pushCouponRecordService; + + @Override public int insertSelective(UserSystemCoupon record) { return userSystemCouponMapper.insertSelective(record); @@ -144,24 +166,34 @@ public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) { return userSystemCouponMapper.getUserCouponBySource(uid, source); } - + @Override public long countUserCouponList(Long uid) { return userSystemCouponMapper.countUserCouponList(uid); } @Override - public void insertUserCoupon(Long uid, String couponType,String source)throws UserSystemCouponException,Exception{ - + @Transactional + public void insertUserCoupon(Long uid, String couponType, String source) + throws UserSystemCouponException, Exception { + if (couponType == null || uid == null) { throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�"); - } + } + + SystemCoupon coupon = null; + if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) { + // 绂忓埄鍏嶅崟鍒� + coupon = systemCouponService.getCouponByType(couponType); + } else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) { + // 濂栧姳鍒�10% + coupon = systemCouponService.getCouponByTypeAndPercent(couponType,new BigDecimal(10)); + } - SystemCoupon coupon= systemCouponService.getCouponByType(couponType); if (coupon == null) { throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝g‘"); - } - + } + int stateActivated = 1; if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) { // 绂忓埄鍒哥姸鎬� @@ -171,12 +203,13 @@ stateActivated = 0; } } - + // 缁撴潫鏃ユ湡 - String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date()); + // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶� + String endDay = DateUtil.plusDay(coupon.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(source); @@ -189,35 +222,40 @@ userCoupon.setUpdateTime(new Date()); // 鎻掑叆鏁版嵁搴� insertSelective(userCoupon); - + executor.execute(new Runnable() { @Override public void run() { UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); // 娣诲姞涓�鏉℃秷鎭� if (userInfoExtra != null) { - userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1); + if (userInfoExtra.getCouponNews() == null) { + userInfoExtra.setCouponNews(1); + } else { + userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1); + } + try { userInfoExtraService.saveUserInfoExtra(userInfoExtra); } catch (UserInfoExtraException e) { e.printStackTrace(); } } - + } }); - + // 娑堟伅鎺ㄩ�� try { - if (coupon.getType() != CouponTypeEnum.welfareFreeCoupon) { + if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) { userOtherMsgNotificationService.welfareCouponGet(userCoupon); - } else if (coupon.getType() != CouponTypeEnum.freeCoupon) { + } else if (coupon.getType() == CouponTypeEnum.freeCoupon) { userOtherMsgNotificationService.freeSheetCouponGet(userCoupon); - } else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) { - userOtherMsgNotificationService.rewardCouponGet(userCoupon); + } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) { + userOtherMsgNotificationService.rewardCouponGet(userCoupon, coupon.getPercent().intValue()); } - - } catch(Exception e) { + + } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch (Exception e1) { @@ -226,8 +264,7 @@ } } - - + @Transactional @Override public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid) throws UserSystemCouponException, Exception { @@ -235,12 +272,12 @@ if (uid == null) { return null; } - + // 鏇存柊杩囨湡鍒� updateCounponInvalid(uid); // 閫�鍥炲埜 sendBackTimeOutCoupon(uid); - + List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid); if (listVO == null || listVO.size() == 0) { return listVO; @@ -257,7 +294,7 @@ * * @param listVO */ - public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{ + public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception { for (UserSystemCouponVO userCouponVO : listVO) { @@ -277,15 +314,19 @@ userCouponVO.setCouponPicture(systemCoupon.getPicture()); userCouponVO.setCouponEffect(systemCoupon.getEffect()); userCouponVO.setCouponRule(systemCoupon.getRule()); + userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid()); // 浣跨敤鐘舵�� Integer state = userCouponVO.getState(); + // 鍒哥被鍨� + CouponTypeEnum type = systemCoupon.getType(); + // 鎸夐挳璺宠浆 Map<String, Object> jumpBtn = null; - + Integer stateActivated = userCouponVO.getStateActivated(); - + if (stateActivated == null || stateActivated == 0) { // 鏄剧ず瑙勫垯 userCouponVO.setCouponRule(systemCoupon.getRemark()); @@ -297,22 +338,22 @@ } jumpBtn = new HashMap<String, Object>(); - Map<String, Object> jumpLink = new HashMap<String, Object>(); - - UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); - + // 閭�璇烽槦鍛樼晫闈� - if (userInfoExtra != null && userInfoExtra.getInviteCode() != null - && userInfoExtra.getInviteCode().trim().length() > 0) { - // 閭�璇锋縺娲绘垚鍔熺晫闈� - jumpLink.put("url", configService.get("invite_activation_success_url") + "?alert=true"); - } else { - // 婵�娲婚個璇风爜鐣岄潰 - jumpLink.put("url", configService.get("invite_activation_url")); - } - - jumpBtn.put("params", jumpLink); - jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web")); + /* + * Map<String, Object> jumpLink = new HashMap<String, Object>(); + * UserInfoExtra userInfoExtra = + * userInfoExtraService.getUserInfoExtra(uid); if (userInfoExtra + * != null && userInfoExtra.getInviteCode() != null && + * userInfoExtra.getInviteCode().trim().length() > 0) { // + * 閭�璇锋縺娲绘垚鍔熺晫闈� jumpLink.put("url", + * configService.get("invite_activation_success_url") + + * "?alert=true"); } else { // 婵�娲婚個璇风爜鐣岄潰 jumpLink.put("url", + * configService.get("invite_activation_url")); } + * jumpBtn.put("params", jumpLink); + */ + + jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite")); } else if (stateActivated == 1) { // 鏄剧ず瑙勫垯 @@ -321,10 +362,9 @@ if (UserSystemCoupon.STATE_CAN_USE == state) { Map<String, Object> jumpLink = new HashMap<String, Object>(); - CouponTypeEnum type = systemCoupon.getType(); if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) { // 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒� - + // 鍏嶅崟鍟嗗搧鍒楄〃 jumpLink.put("url", configService.get("free_goods_list")); @@ -334,25 +374,25 @@ } else if (CouponTypeEnum.rebatePercentCoupon == type) { // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈� - jumpLink.put("state", 2); - + jumpLink.put("state", "2"); + jumpBtn = new HashMap<String, Object>(); jumpBtn.put("params", jumpLink); // 璺宠浆璁㈠崟鍒楄〃 jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList")); } - + } else if (UserSystemCoupon.STATE_IN_USE == state) { // 浣跨敤涓� userCouponVO.setInUseExplain(configService.get("free_coupon_using-help")); } } - + // 鍒稿け鏁堝浘鐗囨浛鎹� if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) { - userCouponVO.setCouponPicture(PIC_INVALID); + userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid()); } - + userCouponVO.setJumpBtn(jumpBtn); String couponTerm = "鏈夋晥鏈燂細"; @@ -417,14 +457,7 @@ userCouponVO.setCouponName(systemCoupon.getName()); userCouponVO.setCouponEffect(systemCoupon.getEffect()); userCouponVO.setCouponRule(systemCoupon.getRule()); - - Integer stateActivated = userCouponVO.getStateActivated(); - if (stateActivated == null || stateActivated == 0) { - userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲� - userCouponVO.setState(0); - } else { - userCouponVO.setCouponPicture(systemCoupon.getPicture()); - } + userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid()); int differentDays = 0; String couponTerm = "鏈夋晥鏈燂細"; @@ -433,7 +466,7 @@ if (endTime != null && startTime != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd"); couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime); - + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1; if (differentDays < 0) { @@ -446,7 +479,23 @@ // 鍓╀綑澶╂暟 Map<String, Object> remainDays = new HashMap<String, Object>(); remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�"); - remainDays.put("fontColor", "#F14242"); + String remainDaysFontColor = ""; + + Integer stateActivated = userCouponVO.getStateActivated(); + if (stateActivated == null || stateActivated == 0) { + userCouponVO.setState(0); + userCouponVO.setCouponEffect("寰呮縺娲�"); + userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid()); + + remainDaysFontColor = "#CCCCCC"; + + } else { + userCouponVO.setCouponPicture(systemCoupon.getPicture()); + + remainDaysFontColor = "#F14242"; + } + + remainDays.put("fontColor", remainDaysFontColor); userCouponVO.setRemainDays(remainDays); } @@ -477,17 +526,21 @@ return hasCoupon; } + @Transactional @Override public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception { + if (uid == null) { throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�"); } - + // 鏇存柊杩囨湡鍒� updateCounponInvalid(uid); // 閫�鍥炲埜 sendBackTimeOutCoupon(uid); - + // 娲诲姩棰嗗彇鍒� +// receivedCoupon(uid); + // 璁㈠崟鐩稿叧鐨勫埜 List<SystemCoupon> couponList = systemCouponService.getOrderCouponList(); if (couponList == null || couponList.size() == 0) { @@ -497,26 +550,63 @@ return getEnableListByCouponId(uid, 1, couponList); } + @Transactional @Override - public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception { + public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) + throws UserSystemCouponException, Exception { + if (uid == null) { throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�"); } - + + if (auctionId == null) { + throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖"); + } + // 鏇存柊杩囨湡鍒� updateCounponInvalid(uid); // 閫�鍥炲埜 sendBackTimeOutCoupon(uid); + // 娲诲姩棰嗗彇鍒� +// receivedCoupon(uid); + // 鍟嗗搧鐩稿叧鐨勫埜 List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList(); if (couponList == null || couponList.size() == 0) { return null; } - return getEnableListByCouponId(uid, null, couponList); + List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList); + + // 鑾峰彇鍟嗗搧璇︽儏 + TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId); + if (taoBaoGoodsBrief != null) { + BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief); + + // 鍒稿悗浠� 澶т簬10鍏� 涓嶈兘鍏嶅崟 + if (quanPrice.compareTo(new BigDecimal(10)) > 0) { + if (list != null && list.size() > 0) { + for (UserSystemCouponVO userCouponVO : list) { + // 鏄剧ず涓嶈兘浣跨敤 + userCouponVO.setState(0); + userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid()); + + Map<String, Object> map = userCouponVO.getRemainDays(); + if (map != null) { + map.put("fontColor", "#CCCCCC"); + } + userCouponVO.setRemainDays(map); + + } + } + } + } + + return list; } + @Transactional @Override public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception { if (uid == null) { @@ -530,6 +620,16 @@ UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id); if (userSystemCoupon == null) { throw new UserSystemCouponException(1, "鍒告暟鎹笉姝g‘"); + } + + 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) { + throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�"); } Long couponUid = userSystemCoupon.getUid(); @@ -548,7 +648,7 @@ && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) { throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤"); } - + Date date = new Date(); // 鏇存柊鍒镐娇鐢� userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); // 姝e湪鍖归厤 @@ -566,19 +666,19 @@ couponRecord.setCreateTime(date); couponRecord.setUpdateTime(date); userSystemCouponRecordService.insertSelective(couponRecord); - + // 娑堟伅鎺ㄩ�� try { - if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) { - userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon); - } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) { - userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon); + if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) { + // userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get); + } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) { + // userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon); } - - } catch(Exception e) { + + } catch (Exception e) { LogHelper.errorDetailInfo(e); } - + } @Transactional @@ -595,6 +695,16 @@ throw new UserSystemCouponException(1, "鍒镐俊鎭笉瀛樺湪"); } + 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) { + throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�"); + } + // 绯荤粺鍒镐俊鎭� SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon(); if (systemCoupon != null && systemCoupon.getId() != null) { @@ -608,7 +718,6 @@ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤"); } - if (orderNo == null || orderNo.trim().length() == 0) { throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪"); } @@ -618,7 +727,6 @@ if (orderVO == null) { throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); } - BigDecimal hongBao = orderVO.getHongBao(); // 绾㈠寘鐘舵�� @@ -684,11 +792,11 @@ couponRecord.setCreateTime(date); couponRecord.setUpdateTime(date); userSystemCouponRecordService.insertSelective(couponRecord); - + // 娑堟伅鎺ㄩ�� try { - userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon); - } catch(Exception e) { + userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo); + } catch (Exception e) { LogHelper.errorDetailInfo(e); } } @@ -730,17 +838,17 @@ } Long uid = userSystemCoupon.getUid(); - - CommonOrderVO commonOrderVO= commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), - orderNo, CommonOrder.STATE_JS); - + + CommonOrderVO commonOrderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, + CommonOrder.STATE_JS); + if (commonOrderVO == null) { throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); } - + // 鑾峰彇濂栧姳閲戦 BigDecimal couponMoney = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid); - + UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO(); userRecordVO.setCouponMoneyState("宸插埌璐�"); userRecordVO.setCommonOrder(commonOrderVO); @@ -754,8 +862,8 @@ } userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%"); - // 璺宠浆绂忓埄涓績 - JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("welfareCore"); + // 璧勯噾鏄庣粏 + JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails"); Map<String, Object> jumpWelfare = new HashMap<String, Object>(); jumpWelfare.put("jumpDetail", welfareCore); Map<String, Object> jumpparms = new HashMap<String, Object>(); @@ -822,7 +930,7 @@ String progressMsg = ""; String progressColor = ""; // 璺宠浆濂栧姳鍒歌鍒� - userRecordVO.setRuleLink(configService.get("reward_coupon_help")); + userRecordVO.setRuleLink(configService.get("free_coupon_help")); // 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊 String progressState1 = "3"; @@ -973,37 +1081,53 @@ return userRecordVO; } - - + + @Transactional @Override - public void activatedWelfareFreeCoupon(Long uid) { + public void activatedWelfareFreeCoupon(Long uid, String fromNickName) { + + LogHelper.test("鍒告縺娲�:" + uid); if (uid == null) { return; } // 绂忓埄鍏嶅崟鍒� String welfareFree = CouponTypeEnum.welfareFreeCoupon.name(); - + SystemCoupon systemCoupon = systemCouponService.getCouponByType(welfareFree); if (systemCoupon == null) { return; } - + + // 楠岃瘉鏄惁澶辨晥 + updateCounponInvalid(uid); + // 寰呮椿绂忓埄鍏嶅崟鍒� List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId()); if (list == null || list.size() == 0) { return; } - - for (UserSystemCoupon userSystemCoupon: list) { + + for (UserSystemCoupon userSystemCoupon : list) { // 婵�娲� - userSystemCoupon.setStateActivated(1); - userSystemCoupon.setUpdateTime(new Date()); - userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon); - + UserSystemCoupon update = new UserSystemCoupon(); + update.setId(userSystemCoupon.getId()); + update.setStateActivated(1); + update.setUpdateTime(new Date()); + userSystemCouponMapper.updateByPrimaryKeySelective(update); + + Integer state = userSystemCoupon.getState(); + if (UserSystemCoupon.STATE_OVERDUE == state) { + continue; // 宸插け鏁堜笉鍋氭秷鎭帹閫� + } + // 娑堟伅鎺ㄩ�� try { - userOtherMsgNotificationService.welfareCouponGet(userSystemCoupon); - } catch(Exception e) { + UserInfo userInfo = new UserInfo(); + userInfo.setId(uid); + userInfo.setNickName(fromNickName); + + userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo); + } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch (Exception e1) { @@ -1012,10 +1136,11 @@ } } } - + + @Transactional @Override public void updateStateByDrawback(String orderNo) throws Exception { - + if (orderNo == null || orderNo.trim().length() == 0) { return; } @@ -1024,19 +1149,20 @@ if (record == null) { return; } - + record.setOrderNo(orderNo); record.setUpdateTime(new Date()); record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK); userSystemCouponRecordService.updateByPrimaryKeySelective(record); - + // 鍒搁��鍥� - sendBackCoupon(record.getUserSystemCoupon()); + sendBackCoupon(record.getUserSystemCoupon(), record); } - + + @Transactional @Override public void updateStateByArrivalAccount(String orderNo) throws Exception { - + if (orderNo == null || orderNo.trim().length() == 0) { return; } @@ -1045,46 +1171,54 @@ if (record == null) { return; } - + record.setOrderNo(orderNo); record.setUpdateTime(new Date()); record.setState(UserSystemCouponRecord.STATE_SUCCESS); userSystemCouponRecordService.updateByPrimaryKeySelective(record); + + // 娑堟伅鎺ㄩ�� + if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) { + userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo); + } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) { + userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo); + } } + @Transactional @Override public void updateCounponInvalid(Long uid) { List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid); if (list == null || list.size() == 0) { return; } - - for (UserSystemCoupon userSystemCoupon: list) { + + for (UserSystemCoupon userSystemCoupon : list) { // 鏇存柊鍒稿凡杩囨湡 userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE); userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon); - + SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon(); if (systemCoupon == null) { continue; } - + SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId()); if (baseCoupon == null || baseCoupon.getId() == null) { continue; } - + // 娑堟伅鎺ㄩ�� try { - if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) { + if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) { userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon); - } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) { + } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) { userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon); - } else if (baseCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) { + } else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) { userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon); } - - } catch(Exception e) { + + } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch (Exception e1) { @@ -1093,35 +1227,37 @@ } } } - + + @Transactional @Override - public void sendBackTimeOutCoupon(Long uid) { + public void sendBackTimeOutCoupon(Long uid) { // 瓒呰繃120绉� 鏈鍖归厤鐨勫埜 - List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120); + List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L); if (list == null || list.size() == 0) { return; } - - for (UserSystemCouponRecord couponRecord: list) { + + for (UserSystemCouponRecord couponRecord : list) { // 鏇存柊鐘舵�侊細鍖归厤瓒呮椂 couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT); couponRecord.setUpdateTime(new Date()); userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord); - + UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon(); - + int expiryDay = 15; - + SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon(); - SystemCoupon coupon= systemCouponService.selectByPrimaryKey(systemCoupon.getId()); + SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId()); if (coupon != null) { expiryDay = coupon.getExpiryDay(); - } - + } + // 缁撴潫鏃ユ湡 Date endTime = null; try { - String endDay = DateUtil.plusDay(expiryDay, new Date()); + // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶� + String endDay = DateUtil.plusDay(expiryDay - 1, new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); endTime = format.parse(endDay); } catch (ParseException e) { @@ -1130,7 +1266,7 @@ // 鐘舵�佸垵濮嬪寲 userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE); userSystemCoupon.setUseTime(null); - + // 鏈夋晥鏈熸椂闂撮噸鏂板畾涔� userSystemCoupon.setStartTime(new Date()); userSystemCoupon.setEndTime(endTime); @@ -1138,32 +1274,29 @@ userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon); } } - + + @Transactional @Override - public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, - Long auctionId) throws Exception{ - - //鍙鐞嗕粯娆鹃噾棰濆皬浜�10鐨� - if(payment==null||payment.compareTo(new BigDecimal(10))<0) - return false; - + public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId) + throws Exception { + boolean isfree = false; - - if (uid == null || payment == null || auctionId == null || orderNo == null || - orderNo.trim().length() == 0 ) { + + if (uid == null || payment == null || auctionId == null || orderNo == null || orderNo.trim().length() == 0) { throw new Exception("浼犻�掑弬鏁颁笉鑳戒负绌�"); } - + // 鏌ヨ绛夊緟鍖归厤鐨勫埜璁板綍 - List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid, UserSystemCouponRecord.STATE_WAIT); + List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid, + UserSystemCouponRecord.STATE_WAIT); if (list == null || list.size() == 0) { - return isfree; + return isfree; } - + // 鍖归厤 boolean matching = false; UserSystemCouponRecord record = null; - + for (UserSystemCouponRecord userSystemCouponRecord : list) { Long goodId = userSystemCouponRecord.getGoodId(); if (auctionId.equals(goodId)) { @@ -1172,58 +1305,58 @@ break; } } - + // 鍟嗗搧鍖归厤鎴愬姛 if (matching) { - + record.setOrderNo(orderNo); record.setUpdateTime(new Date()); - + UserSystemCoupon userSystemCoupon = record.getUserSystemCoupon(); - + if (payment.compareTo(new BigDecimal(10)) > 0) { - // 鏇存柊璁板綍 -- 閲戦涓嶅尮閰� 澶�10鍏� + // 鏇存柊璁板綍 -- 閲戦涓嶅尮閰� 澶�10鍏� record.setState(UserSystemCouponRecord.STATE_FAIL_RULE); userSystemCouponRecordService.updateByPrimaryKeySelective(record); - + // 閫�鍥炲埜 - sendBackCoupon(userSystemCoupon); - + sendBackCoupon(userSystemCoupon, record); + } else { // 鍏嶅崟鍖归厤鎴愬姛 isfree = true; - - //鏇存柊璁板綍--鍏嶅崟涓� + + // 鏇存柊璁板綍--鍏嶅崟涓� record.setState(UserSystemCouponRecord.STATE_FREE_ON); userSystemCouponRecordService.updateByPrimaryKeySelective(record); - + // 鍒哥粨鏉熶娇鐢� userSystemCoupon.setState(UserSystemCoupon.STATE_END_USE); userSystemCoupon.setUpdateTime(new Date()); userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon); - - SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon(); - - SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId()); - if (baseCoupon == null) { - // 鍒稿凡浣跨敤 - userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon); - } else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) { - userOtherMsgNotificationService.welfareCouponUsed(userSystemCoupon); - } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) { - userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon); - } + + String couponType = record.getCouponType(); + if (couponType == null || couponType.trim().length() == 0) { + throw new Exception("鍒哥被鍨嬫湭琚褰�"); + } + + if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) { + userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon, orderNo, payment); + } else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) { + userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment); + } } } - + return isfree; } - + /** * 閫�鍥炲埜 鍒濆鏁版嵁 + * * @param userSystemCoupon */ - public void sendBackCoupon(UserSystemCoupon userSystemCoupon) throws Exception{ + public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception { int expiryDay = 15; @@ -1236,7 +1369,8 @@ // 缁撴潫鏃ユ湡 Date endTime = null; try { - String endDay = DateUtil.plusDay(expiryDay, new Date()); + // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶� + String endDay = DateUtil.plusDay(expiryDay - 1, new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); endTime = format.parse(endDay); } catch (ParseException e) { @@ -1248,12 +1382,319 @@ // 鏈夋晥鏈熸椂闂撮噸鏂板畾涔� userSystemCoupon.setStartTime(new Date()); userSystemCoupon.setEndTime(endTime); - + userSystemCoupon.setUpdateTime(new Date()); - + userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon); + + 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()); + } + } + + @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 hasOrder = commonOrderCountService.hasRebateAndShareOrder(uid); + if (hasOrder) { + 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_CHOUJIANG); + 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 receivedCoupon(Long uid) throws Exception { + + List<PushCoupon> list = pushCouponService.listQueryEffective(); + if (list == null || list.size() == 0) { + return; + } + + List<PushCouponRecord> listRecord = pushCouponRecordService.listByUid(uid); + + for (PushCoupon pushCoupon: list) { + + boolean receive = false; + + String uids = pushCoupon.getUids(); + if (uids == null || uids.trim().length() == 0) { + receive = true; + } else { + String[] uidArray = uids.split(","); + + if (uidArray != null) { + for (int i = 0; i < uidArray.length; i++) { + String str_uid = uidArray[i]; + if (str_uid != null && str_uid.trim().length() > 0) { + if(str_uid.equals(uid.toString())) { + receive = true; + } + } + } + } + } + + if (!receive) { + continue; + } + + if (listRecord != null && listRecord.size() > 0) { + for (PushCouponRecord PushCouponRecord: listRecord) { + PushCoupon pushCoupon2 = PushCouponRecord.getPushCoupon(); + + if (pushCoupon.getId().equals(pushCoupon2.getId()) ) { + receive = false; + break; + } + } + } + + if (receive) { + // 鎻掑叆璁板綍 + PushCouponRecord pushCouponRecord = new PushCouponRecord(); + pushCouponRecord.setPushCoupon(pushCoupon); + pushCouponRecord.setUid(uid); + pushCouponRecord.setCreateTime(new Date()); + pushCouponRecordService.insertSelective(pushCouponRecord); + + // 鎻掑叆鍒� + randomRewardCoupon(pushCoupon, uid); + } + } + } + @Override + @Transactional + public void randomRewardCoupon(PushCoupon pushCoupon, Long uid) throws Exception { + int coupon = 0; + + Integer amount = pushCoupon.getAmount(); + for (int i = 0; i < amount; i++) { + + BigDecimal percent = pushCoupon.getPercent(); + if (percent == null) { + // 杩斿埄姣�-闅忔満 + percent = new BigDecimal(randomNum()); + } + + // 鏌ヨ濂栧姳鍒� + SystemCoupon systemCoupon = systemCouponService.getCouponByTypeAndPercent( + CouponTypeEnum.rebatePercentCoupon.name(),percent); + + if (systemCoupon == null) { + return; + } + + UserSystemCoupon userCoupon = new UserSystemCoupon(); + userCoupon.setUid(uid); + userCoupon.setSource(UserSystemCoupon.SOURCE_SYSTEM_PUSH); + userCoupon.setSystemCoupon(systemCoupon); + userCoupon.setState(UserSystemCoupon.STATE_CAN_USE); + userCoupon.setStateActivated(1); + userCoupon.setStartTime(pushCoupon.getStartTime()); + userCoupon.setEndTime(pushCoupon.getEndTime()); + 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(); + } + } + } + + // 鑾峰彇棰濆淇℃伅 + UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); + if (userInfoExtra == null) { + return; + } + + Integer couponNews = userInfoExtra.getCouponNews(); + if (couponNews == null) { + userInfoExtra.setCouponNews(coupon); + } else { + userInfoExtra.setCouponNews(couponNews + coupon); + } + userInfoExtraService.saveUserInfoExtra(userInfoExtra); + } + + /** + * 闅忔満鍒告瘮渚� + * @return + */ + public int randomNum() { + + int result = 1; + + List<RandomProportion> list = new ArrayList<RandomProportion>(); + list.add(new RandomProportion(1,2,30)); + list.add(new RandomProportion(2,4,25)); + list.add(new RandomProportion(4,6,20)); + list.add(new RandomProportion(6,8,6)); + list.add(new RandomProportion(8,10,6)); + list.add(new RandomProportion(10,20,6)); + list.add(new RandomProportion(20,30,2)); + list.add(new RandomProportion(30,40,2)); + list.add(new RandomProportion(40,50,2)); + list.add(new RandomProportion(50,60,1)); + + int minRange = 0; + int maxRange = 0; + int randomNum = (int) (1 + Math.round(Math.random() * (99))); + + for (int i = 0; i < list.size(); i++) { + + RandomProportion proportion = list.get(i); + int probability = proportion.probability; + + maxRange = maxRange + probability; + minRange = maxRange - probability; + + if (i == list.size() && randomNum > minRange && randomNum <= maxRange) { + result = proportion.minNum + (int) (Math.random() * ((proportion.maxNum - proportion.minNum) + 1)); + break; + } else if(randomNum > minRange && randomNum <= maxRange) { + result = proportion.minNum + (int) (Math.random() * ((proportion.maxNum - proportion.minNum))); + break; + } + } + + return result; + } + + class RandomProportion { + public int minNum;// 鏈�灏� + public int maxNum;// 鏈�澶� + public int probability; // 姒傜巼 + + RandomProportion () {} + + RandomProportion (int minNum, int maxNum, int probability) { + this.minNum = minNum; + this.maxNum = maxNum; + this.probability = probability; + } + } } -- Gitblit v1.8.0