From c833ab8f5968c755ded82eea5e8ce2aca841a0cb Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 27 九月 2019 15:14:06 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java | 61 +++++++++++++++++++----------- 1 files changed, 39 insertions(+), 22 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 7339391..0078a18 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 @@ -6,6 +6,7 @@ import com.yeshi.fanli.dto.msg.MsgOtherExchangeContentDTO; import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO; import com.yeshi.fanli.dto.msg.MsgOtherRewardIntegralDTO; +import com.yeshi.fanli.dto.msg.MsgOtherSystemGiveDTO; import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO; import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum; import com.yeshi.fanli.entity.bus.user.UserInfo; @@ -38,7 +39,7 @@ * @param startTime * @param endTime */ - public void welfareCouponActive(UserSystemCoupon coupon,UserInfo worker); + public void welfareCouponActive(UserSystemCoupon coupon, UserInfo worker); /** * 绂忓埄鍏嶅崟鍒镐娇鐢ㄤ腑 @@ -46,7 +47,7 @@ * @param startTime * @param endTime */ - public void welfareCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money); + public void welfareCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money); /** * 绂忓埄鍏嶅崟鍒稿凡琚娇鐢� @@ -55,7 +56,7 @@ * @param startTime * @param endTime */ - public void welfareCouponUsed(UserSystemCoupon coupon,String orderId); + public void welfareCouponUsed(UserSystemCoupon coupon, String orderId); /** * 绂忓埄鍏嶅崟鍒稿嵆灏嗚繃鏈� @@ -72,13 +73,13 @@ * @param coupon */ public void welfareCouponAlreadyOutOfDate(UserSystemCoupon coupon); - - + /** * 绂忓埄鍏嶅崟鍒稿凡缁忛��鍥� + * * @param coupon */ - public void welfareCouponDrawBack(UserSystemCoupon coupon,String orderId); + public void welfareCouponDrawBack(UserSystemCoupon coupon, String orderId); // 鍏嶅崟鍒� @@ -99,7 +100,7 @@ * @param startTime * @param endTime */ - public void freeSheetCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money); + public void freeSheetCouponUsing(UserSystemCoupon coupon, String orderId, BigDecimal money); /** * 鍏嶅崟鍒稿凡缁忎娇鐢� @@ -109,7 +110,7 @@ * @param startTime * @param endTime */ - public void freeSheetCouponUsed(UserSystemCoupon coupon,String orderId); + public void freeSheetCouponUsed(UserSystemCoupon coupon, String orderId); /** * 鍏嶅崟鍒稿嵆灏嗚繃鏈� @@ -129,31 +130,34 @@ * @param endTime */ public void freeSheetCouponAlreadyOutOfDate(UserSystemCoupon coupon); - + /** * 宸查��鍥� + * * @param coupon */ - public void freeSheetCouponDrawBack(UserSystemCoupon coupon,String orderId); + public void freeSheetCouponDrawBack(UserSystemCoupon coupon, String orderId); // 濂栧姳鍒� - /** - * 濂栧姳鍒歌幏寰� + * 濂栧姳鍒歌幏寰� + * * @param coupon - * @param percent -鐧惧垎姣� + * @param percent + * -鐧惧垎姣� */ - public void rewardCouponGet(UserSystemCoupon coupon,int percent); - + public void rewardCouponGet(UserSystemCoupon coupon, int percent); /** * 濂栧姳鍒镐娇鐢ㄦ垚鍔� + * * @param coupon * @param oldFanLiMoney-鍘熷杩斿埄閲戦 * @param rewardMoney-濂栧姳閲戦 */ - public void rewardCouponUsed(UserSystemCoupon coupon,BigDecimal oldFanLiMoney,BigDecimal rewardMoney,String orderId); + public void rewardCouponUsed(UserSystemCoupon coupon, BigDecimal oldFanLiMoney, BigDecimal rewardMoney, + String orderId); /** * 濂栧姳鍒稿嵆灏嗚繃鏈� @@ -163,7 +167,7 @@ * @param startTime * @param endTime */ - public void rewardCouponWillOutOfDate(UserSystemCoupon coupon,int percent); + public void rewardCouponWillOutOfDate(UserSystemCoupon coupon, int percent); /** * 濂栧姳鍒稿凡缁忚繃鏈� @@ -174,18 +178,18 @@ */ 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 @@ -194,6 +198,7 @@ /** * 鍏戞崲娑堟伅 + * * @param uid * @param beiZhu * @param content @@ -202,6 +207,7 @@ /** * 鍒搁��鍥� + * * @param coupon * @param orderId * @param type @@ -210,6 +216,7 @@ /** * 鍒� + * * @param coupon * @param type */ @@ -222,13 +229,14 @@ * @param startTime * @param endTime */ - public void couponUsingFreeSheet(UserSystemCoupon coupon,String orderId,BigDecimal money, MsgTypeOtherTypeEnum type); - + public void couponUsingFreeSheet(UserSystemCoupon coupon, String orderId, BigDecimal money, + MsgTypeOtherTypeEnum type); + public void couponUsedFreeSheet(UserSystemCoupon coupon, String orderId, MsgTypeOtherTypeEnum type); - /** * 璧犻�佺殑鍏嶅崟鍒告縺娲� + * * @param uid * @param beiZhu * @param content @@ -237,10 +245,19 @@ /** * 闃熷憳棣栧崟濂栧姳閭�璇蜂汉 + * * @param uid * @param beiZhu * @param content */ public void firstOrderRewardMsg(Long uid, String beiZhu, MsgOtherRewardIntegralDTO content); + /** + * 绯荤粺璧犻�佺殑鍏嶅崟鍒� + * @param uid + * @param beiZhu + * @param dto + */ + public void systemGiveRewardCoupon(Long uid, String beiZhu, MsgOtherSystemGiveDTO dto); + } -- Gitblit v1.8.0