From cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 29 七月 2019 10:46:32 +0800
Subject: [PATCH] 订单商品类型处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..3cfc172 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());
}
// 閫氱煡鍏嶅崟鍒拌处
@@ -457,7 +457,7 @@
public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {
if (orderList != null)
for (TaoBaoWeiQuanOrder order : orderList) {
- if (order.getState().equalsIgnoreCase("缁存潈鎴愬姛")) {
+ if (order.getState().contains("缁存潈鎴愬姛")) {
CMQManager.getInstance().addWeiQuanOrderMsg(order);
}
}
@@ -661,7 +661,7 @@
long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,
minDate, maxDate);
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,
(int) weiQuanCount, (int) invalidCount, invitemoney, new Date());
// 澧炲姞璧勯噾
@@ -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)
@@ -760,7 +760,7 @@
long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,
CommonOrder.STATE_SX, minDate, maxDate);
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,
(int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
@@ -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