From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 22 七月 2019 15:39:56 +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/order/OrderProcessServiceImpl.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java index 8f77d93..7cdc06d 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java @@ -403,7 +403,7 @@ } // 鏂扮増閫氱煡 - userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(), + userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),hongBaoOrder.getCommonOrder().getSourceType(), userGoodsCount.get(uid), money, user.getMyHongBao()); } // 閫氱煡鍏嶅崟鍒拌处 @@ -686,7 +686,7 @@ } // 鏂扮増閫氱煡 - userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney, + userMoneyMsgNotificationService.inviteOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(), inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao()); for (String orderId : drawBackOrders) @@ -785,7 +785,7 @@ } // 鏂扮増閫氱煡 - userMoneyMsgNotificationService.shareOrderReceived(uid, shareOrders.size(), shareGoodsCount, sharemoney, + userMoneyMsgNotificationService.shareOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(), shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao()); for (String orderId : drawBackOrders) -- Gitblit v1.8.0