From a57f0c5c9e818173305df3cfb6801fef8af475c6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 18:25:08 +0800
Subject: [PATCH] 删除老版本通知
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 52 ++++++++++------------------------------------------
1 files changed, 10 insertions(+), 42 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 3cfc172..af5d212 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
@@ -54,7 +54,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyService;
-import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
@@ -72,9 +71,6 @@
@Resource
private UserInfoMapper userInfoMapper;
-
- @Resource
- private UserNotificationService userNotificationService;
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@@ -391,20 +387,10 @@
// 绔欏唴淇�+鎺ㄩ��
UserInfo user = userInfoMapper.selectByPKey(uid);
- try {
- userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
- userGoodsCount.get(uid), user.getMyHongBao(), money);
- } catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),hongBaoOrder.getCommonOrder().getSourceType(),
- userGoodsCount.get(uid), money, user.getMyHongBao());
+ userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),
+ hongBaoOrder.getCommonOrder().getSourceType(), userGoodsCount.get(uid), money, user.getMyHongBao());
}
// 閫氱煡鍏嶅崟鍒拌处
try {
@@ -661,8 +647,8 @@
long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,
minDate, maxDate);
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,
- (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO,
+ (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
// 澧炲姞璧勯噾
userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);
@@ -676,18 +662,9 @@
}
}
- // 鍙戦�佹帹閫�
- try {
- // 鎻愭垚鍒拌处娑堟伅閫氱煡
- userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,
- invitemoney);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.inviteOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(), inviteGoodsCount, invitemoney,
- userInfoMapper.selectByPKey(uid).getMyHongBao());
+ userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),
+ inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
@@ -760,8 +737,8 @@
long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
CommonOrder.STATE_SX, minDate, maxDate);
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,
- (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,
+ (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
@@ -775,18 +752,9 @@
}
}
- // 鍙戦�佹帹閫�
- try {
- // 鎻愭垚鍒拌处娑堟伅閫氱煡
- userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,
- sharemoney);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.shareOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(), shareGoodsCount, sharemoney,
- userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
+ shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
--
Gitblit v1.8.0