From d960fdbfe07a65cb80ccb764bfb15ce78ebfd84a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 18:21:04 +0800
Subject: [PATCH] 消息修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
index 7c88661..9bfe81a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
@@ -147,7 +147,7 @@
return hongBaoV2Mapper.selectByPrimaryKey(id);
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public int addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException, UserAccountException {
Set<Integer> stateSet = new HashSet<>();// 璁㈠崟鐘舵�丼et
@@ -190,22 +190,28 @@
switch (t) {
case HongBaoV2.TYPE_ZIGOU:
userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state);
+ commonOrder.getPayment(), money, goodsCount, commonOrder.getState(),
+ commonOrder.getThirdCreateTime());
+
break;
case HongBaoV2.TYPE_SHARE_GOODS:
userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state);
+ commonOrder.getPayment(), money, goodsCount, commonOrder.getState(),
+ commonOrder.getThirdCreateTime());
+
break;
case HongBaoV2.TYPE_YIJI:
-
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state);
+ commonOrder.getPayment(), money, goodsCount, commonOrder.getState(),
+ commonOrder.getThirdCreateTime());
+
break;
case HongBaoV2.TYPE_ERJI:
+
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType, commonOrder.getPayment(), money,
+ goodsCount, commonOrder.getState(), commonOrder.getThirdCreateTime());
- userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
- commonOrder.getPayment(), money, goodsCount, state);
break;
case HongBaoV2.TYPE_SHARE_YIJI:
@@ -277,7 +283,7 @@
return CommonOrder.STATE_SX;
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
private boolean updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,
Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException, UserAccountException {
System.out.println(commonOrder.getOrderNo());
@@ -664,7 +670,7 @@
return true;
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
private void saveHongBao(CommonOrder commonOrder, int type, Map<Integer, HongBaoOrder> notificationMap)
throws HongBaoException, UserAccountException {
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
@@ -1177,8 +1183,7 @@
public List<HongBaoV2> listByIds(List<Long> idList) {
return hongBaoV2Mapper.listByIds(idList);
}
-
-
+
@Override
public List<HongBaoDTO> listByOrderTradeId(String tradeId) {
return hongBaoV2Mapper.listByOrderTradeId(tradeId);
--
Gitblit v1.8.0