From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 27 八月 2019 18:04:38 +0800 Subject: [PATCH] 金币任务多次获取bug修改 --- fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java | 130 +++++++++++++++++++++++++++++------------- 1 files changed, 89 insertions(+), 41 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java index 2054efe..3ae41ab 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java @@ -1,5 +1,12 @@ package com.yeshi.fanli.service.inter.msg; +import java.math.BigDecimal; + +import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO; +import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO; +import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO; +import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum; +import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.UserSystemCoupon; /** @@ -29,7 +36,7 @@ * @param startTime * @param endTime */ - public void welfareCouponActive(UserSystemCoupon coupon); + public void welfareCouponActive(UserSystemCoupon coupon,UserInfo worker); /** * 绂忓埄鍏嶅崟鍒镐娇鐢ㄤ腑 @@ -37,7 +44,7 @@ * @param startTime * @param endTime */ - public void welfareCouponUsing(UserSystemCoupon coupon); + public void welfareCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money); /** * 绂忓埄鍏嶅崟鍒稿凡琚娇鐢� @@ -46,7 +53,7 @@ * @param startTime * @param endTime */ - public void welfareCouponUsed(UserSystemCoupon coupon); + public void welfareCouponUsed(UserSystemCoupon coupon,String orderId); /** * 绂忓埄鍏嶅崟鍒稿嵆灏嗚繃鏈� @@ -60,10 +67,16 @@ /** * 绂忓埄鍏嶅崟鍒稿凡缁忚繃鏈� * - * @param startTime - * @param endTime + * @param coupon */ public void welfareCouponAlreadyOutOfDate(UserSystemCoupon coupon); + + + /** + * 绂忓埄鍏嶅崟鍒稿凡缁忛��鍥� + * @param coupon + */ + public void welfareCouponDrawBack(UserSystemCoupon coupon,String orderId); // 鍏嶅崟鍒� @@ -78,23 +91,13 @@ public void freeSheetCouponGet(UserSystemCoupon coupon); /** - * 鍏嶅崟鍒告縺娲� - * - * @param leftDay - * @param source - * @param startTime - * @param endTime - */ - public void freeSheetCouponActive(UserSystemCoupon coupon); - - /** * 鍏嶅崟鍒告鍦ㄤ娇鐢� * * @param source * @param startTime * @param endTime */ - public void freeSheetCouponUsing(UserSystemCoupon coupon); + public void freeSheetCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money); /** * 鍏嶅崟鍒稿凡缁忎娇鐢� @@ -104,7 +107,7 @@ * @param startTime * @param endTime */ - public void freeSheetCouponUsed(UserSystemCoupon coupon); + public void freeSheetCouponUsed(UserSystemCoupon coupon,String orderId); /** * 鍏嶅崟鍒稿嵆灏嗚繃鏈� @@ -124,38 +127,31 @@ * @param endTime */ public void freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon); + + /** + * 宸查��鍥� + * @param coupon + */ + public void freeSheetCouponDrawBack(UserSystemCoupon coupon,String orderId); // 濂栧姳鍒� - /** - * 濂栧姳鍒歌幏寰� - * - * @param leftDay - * @param source - * @param startTime - * @param endTime - */ - public void rewardCouponGet(UserSystemCoupon coupon); /** - * 濂栧姳鍒告縺娲� - * - * @param leftDay - * @param source - * @param startTime - * @param endTime + * 濂栧姳鍒歌幏寰� + * @param coupon + * @param percent -鐧惧垎姣� */ - public void rewardCouponActive(UserSystemCoupon coupon); + public void rewardCouponGet(UserSystemCoupon coupon,int percent); + /** - * 濂栧姳鍒稿凡缁忎娇鐢� - * - * @param leftDay - * @param source - * @param startTime - * @param endTime + * 濂栧姳鍒镐娇鐢ㄦ垚鍔� + * @param coupon + * @param oldFanLiMoney-鍘熷杩斿埄閲戦 + * @param rewardMoney-濂栧姳閲戦 */ - public void rewardCouponUsed(UserSystemCoupon coupon); + public void rewardCouponUsed(UserSystemCoupon coupon,BigDecimal oldFanLiMoney,BigDecimal rewardMoney,String orderId); /** * 濂栧姳鍒稿嵆灏嗚繃鏈� @@ -165,7 +161,7 @@ * @param startTime * @param endTime */ - public void rewardCouponWillOutOfDate(UserSystemCoupon coupon); + public void rewardCouponWillOutOfDate(UserSystemCoupon coupon,int percent); /** * 濂栧姳鍒稿凡缁忚繃鏈� @@ -176,4 +172,56 @@ */ public void rewardCouponAlreadyOutOfDate(UserSystemCoupon coupon); + + /** + * 娣樼ぜ閲戞秷鎭� + * @param uid + * @param beiZhu + * @param content + */ + public void taoLiJinMsg(Long uid, String beiZhu, MsgOtherTaoLiJinContentDTO content); + + + /** + * 鍙ｄ护璧犻�侀鍙� + * @param uid + * @param beiZhu + * @param content + */ + public void tokenGiveMsg(Long uid, String beiZhu, MsgOtherGiveContentDTO content); + + /** + * 鍏戞崲娑堟伅 + * @param uid + * @param beiZhu + * @param content + */ + public void exchangeMsg(Long uid, String beiZhu, MsgOtherExchangeContentDTO content); + + /** + * 鍒搁��鍥� + * @param coupon + * @param orderId + * @param type + */ + public void couponDrawBack(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type); + + /** + * 鍒� + * @param coupon + * @param type + */ + public void outOfDate(UserSystemCoupon coupon, MsgTypeOtherTypeEnum type); + + /** + * 鍏嶅崟鍒告鍦ㄤ娇鐢� + * + * @param source + * @param startTime + * @param endTime + */ + public void couponUsingFreeSheet(UserSystemCoupon coupon,String orderId,BigDecimal money, MsgTypeOtherTypeEnum type); + + public void couponUsedFreeSheet(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type); + } -- Gitblit v1.8.0