From fb5a8918a7983bbdf83586f773884d3961bb3c6d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 16 八月 2019 17:50:56 +0800 Subject: [PATCH] 口令领取+消息 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 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 70fc695..4f358ad 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 @@ -198,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())) { // 闅忔満濂栧姳鍒� @@ -219,6 +219,8 @@ if (countSuccess == 0) { stateActivated = 0; } + } else if (coupon.getType() == CouponTypeEnum.freeCoupon) { + stateActivated = 0; } // 缁撴潫鏃ユ湡 @@ -1935,4 +1937,29 @@ 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); + + // TODO 璧犻�佹秷鎭� + } + + } -- Gitblit v1.8.0