From 09417e97672be66c5e312b10f23a9e30da3acb97 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期一, 24 二月 2020 15:23:08 +0800
Subject: [PATCH] 热销转换发圈

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderProcessServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..094f1e5 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 {
@@ -134,7 +134,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