From 0588d6be74335f41c79a8d8e32dbd1c3d3e47fa3 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 29 五月 2019 17:20:50 +0800 Subject: [PATCH] 精选库商品入库及更新调整 + 9k9类商品查询取消标签查询 --- fanli/src/main/java/com/yeshi/fanli/service/inter/msg/UserOtherMsgNotificationService.java | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 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 1219fca..42094d4 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 @@ -93,7 +93,7 @@ * @param startTime * @param endTime */ - public void freeSheetCouponUsing(UserSystemCoupon coupon); + public void freeSheetCouponUsing(UserSystemCoupon coupon,String orderId,BigDecimal money); /** * 鍏嶅崟鍒稿凡缁忎娇鐢� @@ -103,7 +103,7 @@ * @param startTime * @param endTime */ - public void freeSheetCouponUsed(UserSystemCoupon coupon); + public void freeSheetCouponUsed(UserSystemCoupon coupon,String orderId); /** * 鍏嶅崟鍒稿嵆灏嗚繃鏈� @@ -128,29 +128,26 @@ * 宸查��鍥� * @param coupon */ - public void freeSheetCouponDrawBack(UserSystemCoupon 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 rewardCouponUsed(UserSystemCoupon coupon); + public void rewardCouponGet(UserSystemCoupon coupon,int percent); + + + /** + * 濂栧姳鍒镐娇鐢ㄦ垚鍔� + * @param coupon + * @param oldFanLiMoney-鍘熷杩斿埄閲戦 + * @param rewardMoney-濂栧姳閲戦 + */ + public void rewardCouponUsed(UserSystemCoupon coupon,BigDecimal oldFanLiMoney,BigDecimal rewardMoney,String orderId); /** * 濂栧姳鍒稿嵆灏嗚繃鏈� @@ -160,7 +157,7 @@ * @param startTime * @param endTime */ - public void rewardCouponWillOutOfDate(UserSystemCoupon coupon); + public void rewardCouponWillOutOfDate(UserSystemCoupon coupon,int percent); /** * 濂栧姳鍒稿凡缁忚繃鏈� -- Gitblit v1.8.0