From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 ac4c5c5..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());
+
}
}
@@ -134,7 +129,7 @@
new BigDecimal(100)));
if (elmeOrder.getIsSettle() == true)
hongBao.setPreGetTime(new Date(elmeOrder.getOrderDate().getTime() + 1000 * 60 * 60 * 24 * 15L));
- if (elmeOrder.getPayMoney().compareTo(new BigDecimal(0)) <= 0)
+ if (elmeOrder.getPayMoney().compareTo(new BigDecimal(0)) <= 0||(elmeOrder.getState()!=null&&elmeOrder.getState()==0))
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
else {
if (elmeOrder.getIsSettle() == true) {
--
Gitblit v1.8.0