From 0e552c5dba18d27622116a7d7a6e04fc99f8e8a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 一月 2019 14:14:23 +0800
Subject: [PATCH] Merge branch 'dev-msg'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 8e64de9..51df0e4 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
@@ -508,8 +508,8 @@
// 鍔犲叆閫氱煡
if (notificationMap.get(type) == null) {
- HongBaoV2 tempHongBao = new HongBaoV2(hongBao.getId());
- tempHongBao.setUserInfo(hongBao.getUserInfo());
+ HongBaoV2 tempHongBao = new HongBaoV2(oldHongBao.getId());
+ tempHongBao.setUserInfo(oldHongBao.getUserInfo());
tempHongBao.setMoney(hongBao.getMoney());
CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
tempCommonOrder.setPayment(commonOrder.getPayment());
@@ -741,21 +741,21 @@
}
hongBaoV2Mapper.insertSelective(firstHongbao);
// 鐢ㄦ埛閫氱煡
- if (notificationMap.get(type) == null) {
+ if (notificationMap.get(HongBaoV2.TYPE_YIJI) == null) {
HongBaoV2 tempHongBao = new HongBaoV2(firstHongbao.getId());
tempHongBao.setUserInfo(firstHongbao.getUserInfo());
tempHongBao.setMoney(firstHongbao.getMoney());
CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
tempCommonOrder.setPayment(commonOrder.getPayment());
- notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));
+ notificationMap.put(HongBaoV2.TYPE_YIJI, new HongBaoOrder(tempCommonOrder, tempHongBao));
} else {
// 澧炲姞浠樻閲戦涓庤祫閲�
- HongBaoOrder tempHongBaoOrder = notificationMap.get(type);
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_YIJI);
tempHongBaoOrder.getCommonOrder()
.setPayment(tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
tempHongBaoOrder.getHongBaoV2()
.setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(firstHongbao.getMoney()));
- notificationMap.put(type, tempHongBaoOrder);
+ notificationMap.put(HongBaoV2.TYPE_YIJI, tempHongBaoOrder);
}
// 鎻掑叆浜岀骇瀛愮孩鍖�
@@ -789,21 +789,21 @@
hongBaoV2Mapper.insertSelective(secondHongbao);
// 鐢ㄦ埛閫氱煡
- if (notificationMap.get(type) == null) {
+ if (notificationMap.get(HongBaoV2.TYPE_ERJI) == null) {
HongBaoV2 tempHongBao = new HongBaoV2(secondHongbao.getId());
tempHongBao.setUserInfo(secondHongbao.getUserInfo());
tempHongBao.setMoney(secondHongbao.getMoney());
CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
tempCommonOrder.setPayment(commonOrder.getPayment());
- notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));
+ notificationMap.put(HongBaoV2.TYPE_ERJI, new HongBaoOrder(tempCommonOrder, tempHongBao));
} else {
// 澧炲姞浠樻閲戦涓庤祫閲�
- HongBaoOrder tempHongBaoOrder = notificationMap.get(type);
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_ERJI);
tempHongBaoOrder.getCommonOrder().setPayment(
tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
tempHongBaoOrder.getHongBaoV2()
.setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(secondHongbao.getMoney()));
- notificationMap.put(type, tempHongBaoOrder);
+ notificationMap.put(HongBaoV2.TYPE_ERJI, tempHongBaoOrder);
}
}
--
Gitblit v1.8.0