From c04a59775ee986f33fe19e21ae02cff9f6b002a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java
index f5e71a1..ec3536f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java
@@ -52,7 +52,7 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void processOrder(ElmeOrder elmeOrder) throws ElmeOrderException {
try {
@@ -97,9 +97,7 @@
} catch (ElmeHongBaoOrderMapException e) {
throw new ElmeOrderException(e.getCode(), e.getMsg());
}
- // 鍙戦�佹秷鎭�
- userOrderMsgNotificationService.orderElmeStatistic(user.getId(), elmeOrder.getOrderId(),
- Constant.SOURCE_TYPE_ELME, elmeOrder.getPayMoney(), hongBao.getMoney(), hongBao.getState());
+
} else {// 璁㈠崟瀛樺湪
HongBaoV2 oldHongBao = hongBaoV2Service.selectByPrimaryKey(map.getHongBao().getId());
if (oldHongBao == null)
@@ -115,10 +113,7 @@
update.setPreGetTime(hongBao.getPreGetTime());
update.setUpdateTime(new Date());
hongBaoV2Service.updateByPrimaryKeySelective(update);
- // 鍙戦�佹秷鎭�
- userOrderMsgNotificationService.orderElmeStateChanged(oldHongBao.getUserInfo().getId(),
- elmeOrder.getOrderId(), Constant.SOURCE_TYPE_ELME, elmeOrder.getPayMoney(), hongBao.getMoney(),
- hongBao.getState());
+
}
}
--
Gitblit v1.8.0