From 758be4456bb88c8c7fd008d1aa38cb64783880ee Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 31 七月 2019 10:11:18 +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/impl/hongbao/HongBaoV2ServiceImpl.java | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java index 6dfde25..ca70561 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java @@ -25,7 +25,6 @@ import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper; import com.yeshi.fanli.dto.HongBao; import com.yeshi.fanli.dto.HongBaoDTO; -import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail; import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo; @@ -48,7 +47,6 @@ import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService; import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService; import com.yeshi.fanli.service.inter.user.UserInfoService; -import com.yeshi.fanli.service.inter.user.UserNotificationService; import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService; import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService; import com.yeshi.fanli.service.inter.user.UserSystemCouponService; @@ -95,9 +93,6 @@ @Resource private ThreeSaleSerivce threeSaleSerivce; - - @Resource - private UserNotificationService userNotificationService; @Resource private UserOrderMsgNotificationService userOrderMsgNotificationService; @@ -189,20 +184,17 @@ money, goodsCount, state); break; case HongBaoV2.TYPE_SHARE_GOODS: - userNotificationService.orderShareStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK, - null, money); + userOrderMsgNotificationService.orderShareStatistic(uid, orderId,orderType, commonOrder.getPayment(), money, goodsCount, state); break; case HongBaoV2.TYPE_YIJI: - userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount, - MsgOrderDetail.STATE_FK, null, money); + userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(), money, goodsCount, state); break; case HongBaoV2.TYPE_ERJI: - userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount, - MsgOrderDetail.STATE_FK, null, money); + userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(), money, goodsCount, state); break; -- Gitblit v1.8.0