From 9c09cead959dbeef292628f345e5f80c30fc3d17 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 19 八月 2019 17:42:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/mater-1.6.0' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 381 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 365 insertions(+), 16 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 300ac5c..46b9769 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 @@ -20,9 +20,12 @@ 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; +import com.yeshi.fanli.entity.bus.user.TokenRecord.TokenTypeEnum; 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.UserSystemCouponGiveRecord; import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord; import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.entity.money.UserMoneyDetail; @@ -48,14 +51,18 @@ 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.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.account.UserUtil; import com.yeshi.fanli.util.factory.UserMoneyDetailFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; @@ -77,6 +84,9 @@ @Resource private UserSystemCouponMapper userSystemCouponMapper; + @Resource + private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService; + @Resource private ConfigService configService; @@ -134,6 +144,9 @@ @Resource private PushCouponRecordService pushCouponRecordService; + @Resource + private TokenRecordService tokenRecordService; + @Override public int insertSelective(UserSystemCoupon record) { @@ -185,8 +198,8 @@ } SystemCoupon coupon = null; - if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) { - // 绂忓埄鍏嶅崟鍒� + if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())) { + // 鍏嶅崟鍒� coupon = systemCouponService.getCouponByType(couponType); } else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) { // 闅忔満濂栧姳鍒� @@ -206,6 +219,8 @@ if (countSuccess == 0) { stateActivated = 0; } + } else if (coupon.getType() == CouponTypeEnum.freeCoupon) { + stateActivated = 0; } // 缁撴潫鏃ユ湡 @@ -609,7 +624,7 @@ @Transactional @Override - public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception { + public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception { if (uid == null) { throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�"); } @@ -660,7 +675,7 @@ // 鎻掑叆浣跨敤鍒歌褰� UserSystemCouponRecord couponRecord = new UserSystemCouponRecord(); couponRecord.setGoodId(goodId); - couponRecord.setGoodSource(Constant.SOURCE_TYPE_TAOBAO); // 榛樿娣樺疂 + couponRecord.setGoodSource(sourceType); // 榛樿娣樺疂 couponRecord.setState(UserSystemCouponRecord.STATE_WAIT); // 姝e湪鍖归厤 couponRecord.setUserSystemCoupon(userSystemCoupon); couponRecord.setCouponType(baseCoupon.getType().name()); @@ -684,12 +699,16 @@ @Transactional @Override - public void useOrderCoupon(Long uid, Long id, String orderNo, Integer goodsType) throws UserSystemCouponException, Exception { + public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) throws UserSystemCouponException, Exception { if (id == null) { throw new UserSystemCouponException(1, "鍒竔d涓嶅瓨鍦�"); } - + + if (sourceType == null) { + sourceType = Constant.SOURCE_TYPE_TAOBAO; + } + // 鐢ㄦ埛鍒� UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id); if (userSystemCoupon == null) { @@ -724,7 +743,7 @@ } // 璁㈠崟 - CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS); + CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS, sourceType); if (orderVO == null) { throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); } @@ -738,7 +757,7 @@ // 鏉′欢: A:蹇呴』鏄繑鍒╄鍗� 銆丅:蹇呴』宸茬粡澶勪簬宸插埌璐︾姸鎬� if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState || hongBao != null) { - Order order = orderService.findOrderByOrderIdAndType(orderNo, goodsType); + Order order = orderService.findOrderByOrderIdAndType(orderNo, sourceType); if (order == null) return; @@ -766,14 +785,14 @@ // 2.鎻掑叆鍏宠仈 orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order); - // 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓 // TODO - UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo,goodsType, money, + // 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓 + UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, sourceType, money, new UserInfo(uid)); userMoneyDetailService.addUserMoneyDetail(userMoneyDetail); userInfoService.addMoney(new UserInfo(uid), money); // 鎻掑叆璧勯噾閫氱煡 - userMoneyMsgNotificationService.orderReward(uid, orderNo,goodsType, money, + userMoneyMsgNotificationService.orderReward(uid, orderNo, sourceType, money, userInfoService.selectByPKey(uid).getMyHongBao()); /* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */ @@ -788,7 +807,7 @@ // 鎻掑叆浣跨敤鍒歌褰� UserSystemCouponRecord couponRecord = new UserSystemCouponRecord(); couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS); - couponRecord.setGoodSource(goodsType); + couponRecord.setGoodSource(sourceType); couponRecord.setOrderNo(orderNo); couponRecord.setUserSystemCoupon(userSystemCoupon); couponRecord.setCouponType(systemCoupon.getType().name()); @@ -807,7 +826,7 @@ } @Override - public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception { + public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception { if (orderNo == null || orderNo.trim().length() == 0) { throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪"); @@ -843,7 +862,7 @@ Long uid = userSystemCoupon.getUid(); CommonOrderVO commonOrderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, - CommonOrder.STATE_JS); + CommonOrder.STATE_JS, sourceType); if (commonOrderVO == null) { throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); @@ -885,7 +904,7 @@ } @Override - public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception { + public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception { if (orderNo == null || orderNo.trim().length() == 0) { throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪"); @@ -913,7 +932,7 @@ } // 璁㈠崟 - CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null); + CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null, sourceType); if (orderVO == null) { throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); } @@ -1629,4 +1648,334 @@ } } + + @Override + @Transactional + public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception { + if (couponType == null || uid == null) { + throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�"); + } + + SystemCoupon coupon = null; + if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) { + coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent); + } else { + coupon = systemCouponService.getCouponByType(couponType); + } + + if (coupon == null) { + throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝g‘"); + } + + int stateActivated = 1; + if (couponType == CouponTypeEnum.freeCoupon.name()) { + stateActivated = 0; // + } else if (couponType == CouponTypeEnum.welfareFreeCoupon.name() && threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) { + stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲� + } + + // 璁$畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶� + 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); + userCoupon.setSystemCoupon(coupon); + userCoupon.setStateActivated(stateActivated); + userCoupon.setStartTime(new Date()); + userCoupon.setEndTime(endTime); + userCoupon.setGive(false); + 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) + throws UserSystemCouponException, Exception { + // 鏇存柊杩囨湡鍒� + updateCounponInvalid(uid); + // 閫�鍥炲埜 + sendBackTimeOutCoupon(uid); + + List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid); + if (listVO == null || listVO.size() == 0) { + return listVO; + } + + // 鏄惁婵�娲婚個璇风爜 + String inviteCode = null; + UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); + if (userInfoExtra != null) { + inviteCode = userInfoExtra.getInviteCode(); + } + + for (UserSystemCouponVO userCouponVO : listVO) { + SystemCoupon systemCoupon = userCouponVO.getSystemCoupon(); + if (systemCoupon != null && systemCoupon.getId() != null) { + systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId()); + } + + if (systemCoupon == null) { + continue; // 鍒镐俊鎭笉瀹屾暣 + } + + userCouponVO.setSource("鏉ユ簮锛�" + userCouponVO.getSource()); + userCouponVO.setCouponName(systemCoupon.getName()); + userCouponVO.setCouponEffect(systemCoupon.getEffect()); + userCouponVO.setCouponRule(systemCoupon.getRule()); + userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink()); + + String couponTerm = "鏈夋晥鏈燂細"; + Date startTime = userCouponVO.getStartTime(); + Date endTime = userCouponVO.getEndTime(); + if (endTime != null && startTime != null) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd"); + couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime); + } + userCouponVO.setCouponTerm(couponTerm); + + Integer state = userCouponVO.getState(); + if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) { + userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid()); + } else { + userCouponVO.setCouponPicture(systemCoupon.getPicture()); + } + + if (UserSystemCoupon.STATE_CAN_USE == state) { + int differentDays = 0; + if (endTime != null && startTime != null) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + differentDays = DateUtil.daysBetween(sdf.format(new Date()), sdf.format(endTime)) + 1; + if (differentDays < 0) { + differentDays = 0; + } + } + // 鍓╀綑澶╂暟 + Map<String, Object> remainDays = new HashMap<String, Object>(); + remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�"); + remainDays.put("fontColor", "#F14242"); + userCouponVO.setRemainDays(remainDays); + } + + Map<String, Object> jumpBtn = null; + CouponTypeEnum type = systemCoupon.getType(); + Integer stateActivated = userCouponVO.getStateActivated(); + + // 鏈縺娲� + if (stateActivated == null || stateActivated == 0) { + userCouponVO.setCouponEffect("寰呮縺娲�"); + userCouponVO.setCouponRule(systemCoupon.getRemark()); + if (UserSystemCoupon.STATE_CAN_USE == state) { + state = 0; + userCouponVO.setState(state); + if (CouponTypeEnum.freeCoupon == type) { + List<String> listTip = new ArrayList<String>(); + listTip.add("鏈厤鍗曞埜鐢卞ソ鍙嬭禒閫侊紝浠庤幏璧犳棩璧�60澶╁唴闇�浜х敓3绗旇繑鍒╄鍗曪紱"); + listTip.add("杩斿埄璁㈠崟鈥滃凡鍒拌处鈥濆悗锛屾柟鑳借涓鸿鍗曚骇鐢熸垚鍔燂紱"); + listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��"); + userCouponVO.setTips(listTip); + userCouponVO.setPopup(true); + } else if (CouponTypeEnum.welfareFreeCoupon == type) { + jumpBtn = new HashMap<String, Object>(); + if (inviteCode != null && inviteCode.trim().length() > 0) { + jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_friends")); + } else { + jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate")); + } + } + } + } + + if (UserSystemCoupon.STATE_IN_USE == state && (CouponTypeEnum.freeCouponBuy == type + || CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type)) { + userCouponVO.setInUseExplain(configService.get("free_coupon_using-help")); + } + + // 鏄惁宸茶禒閫� + Boolean give = userCouponVO.getGive(); + if (give == null) { + give = false; + } + + if (UserSystemCoupon.STATE_CAN_USE == state) { + Map<String, Object> jumpLink = new HashMap<String, Object>(); + if (CouponTypeEnum.freeCouponGive == type) { + userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY); + } else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type + || CouponTypeEnum.freeCouponBuy == type) { + jumpLink.put("url", configService.get("free_goods_list")); + jumpBtn = new HashMap<String, Object>(); + jumpBtn.put("params", jumpLink); + jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web")); + } else if (CouponTypeEnum.rebatePercentCoupon == type) { + // 鍙娇鐢ㄣ�� 鍙禒閫� + userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE); + + // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈� + 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) { + if (CouponTypeEnum.freeCouponGive == type) { + userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN); + } + + if (give && CouponTypeEnum.rebatePercentCoupon == type) { + userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN); + } + } else if (UserSystemCoupon.STATE_END_USE == state) { + if (CouponTypeEnum.freeCouponGive == type) { + userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END); + } + + if (give && CouponTypeEnum.rebatePercentCoupon == type) { + userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END); + } + } + userCouponVO.setJumpBtn(jumpBtn); + } + return listVO; + } + + + @Transactional + @Override + public String 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_OVERDUE) + throw new UserSystemCouponException(1, "璇ュ埜宸茶繃鏈�"); + + if (state == UserSystemCoupon.STATE_END_USE) + throw new UserSystemCouponException(1, "璇ュ埜浣跨敤/璧犻�佹垚鍔�"); + + CouponTypeEnum type = systemCoupon.getType(); + if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon ) + throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�"); + + TokenTypeEnum tokenTypeEnum = null; + if (type == CouponTypeEnum.freeCouponGive) { + tokenTypeEnum = TokenTypeEnum.freeCoupon; + } else if (type == CouponTypeEnum.rebatePercentCoupon){ + tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon; + } else { + throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�"); + } + + String token = null; + Date nowDate = new Date(); + TokenRecord record = tokenRecordService.getNearByTypeAndIdentify(tokenTypeEnum.name(), id+""); + if (record != null && record.getEndTime().getTime() > nowDate.getTime()) { + token = record.getToken(); + } else { + for (int i = 0; i < 5; i++) { + try { + // TODO 鍙d护鐢熸垚瑙勫垯寰呭畾 + long num = 10000 + (long) (Math.random() * 10000); + token = UserUtil.getInviteCode(num); + + String endDay = DateUtil.plusDay(Constant.TOKEN_DAYS - 1,nowDate); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + Date endTime = format.parse(endDay); + + TokenRecord tokenRecord = new TokenRecord(); + tokenRecord.setUid(uid); + tokenRecord.setIdentify(id+""); + tokenRecord.setType(tokenTypeEnum); + tokenRecord.setStartTime(nowDate); + tokenRecord.setEndTime(endTime); + tokenRecord.setToken(token); + tokenRecord.setState(0); + tokenRecordService.insertSelective(tokenRecord); + } catch (Exception e) { + LogHelper.errorDetailInfo(e); + token = null; + } + + if(!StringUtil.isNullOrEmpty(token)) { + break; + } + } + + if(StringUtil.isNullOrEmpty(token)) + throw new UserSystemCouponException(1, "鍙d护鐢熸垚澶辫触"); + + // 鎻掑叆璧犻�佽褰� + try { + String endDay = DateUtil.plusDay(Constant.GIVE_DAYS - 1, new Date()); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + Date endTime = format.parse(endDay); + + UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord(); + giveRecord.setCouponId(id); + giveRecord.setGiveUid(uid); + giveRecord.setGiveTime(nowDate); + giveRecord.setEndTime(endTime); + userSystemCouponGiveRecordService.insertSelective(giveRecord); + } catch (Exception e) { + LogHelper.errorDetailInfo(e); + throw new UserSystemCouponException(1, "璧犻�佽褰曞垱寤哄け璐�"); + } + } + + if(StringUtil.isNullOrEmpty(token)) + throw new UserSystemCouponException(1, "鍙d护鐢熸垚澶辫触"); + + userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); + userSystemCoupon.setGive(true); + userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon); + + String tips = "閫佺粰浣犱竴寮犺繑鍒╁鍔卞埜蹇幓棰嗗彇鍚э紝澶嶅埗鏈潯娑堟伅[&%s&]锛屾墦寮�[杩斿埄鍒竇App棰嗗彇锛屼娇鐢ㄥ悗鍙杩斿埄鍔犲�嶃�俓r\n" + +"----------------------------\r\n" + + "涓嬭浇[杩斿埄鍒竇App閾炬帴:%s\r\n" + + "PS锛氬彛浠ゅ皢浼�24灏忔椂鍐呭け鏁堬紝璇峰強鏃堕鍙栥��"; + + tips = String.format(tips, token, configService.get("app_down_link")); + + return tips; + } + + + @Override + public void updateGiveRecord(Long uid, Long id, String couponType) { + Date date = new Date(); + // 鏇存柊鍒哥姸鎬侊細宸蹭娇鐢� + UserSystemCoupon userCoupon = new UserSystemCoupon(); + userCoupon.setId(id); + userCoupon.setState(UserSystemCoupon.STATE_END_USE); + userCoupon.setUseTime(date); + userCoupon.setUpdateTime(date); + userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon); + + // 鎻掑叆浣跨敤鍒歌褰� + UserSystemCouponRecord couponRecord = new UserSystemCouponRecord(); + couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS); + couponRecord.setUserSystemCoupon(userCoupon); + couponRecord.setCouponType(couponType); + couponRecord.setCreateTime(date); + couponRecord.setUpdateTime(date); + userSystemCouponRecordService.insertSelective(couponRecord); + } + + } -- Gitblit v1.8.0