From 0b57cfd62e842b309d03467b96a331c673ecad7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 21 四月 2020 14:08:18 +0800
Subject: [PATCH] 删除普通会员等级

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 682dbe0..eee6671 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -1246,6 +1246,23 @@
 	@Transactional(rollbackFor = Exception.class)
 	public void invalidHongBaoV2AndGiveGodenCorn(Long hongBaoId, Long uid, String orderId, int sourceType,
 			String beiZhu) throws Exception {
+		HongBaoOrder hongbaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBaoId);
+		if (hongbaoOrder != null) {
+			CommonOrder commonOrder = commonOrderService.selectByPrimaryKey(hongbaoOrder.getCommonOrder().getId());
+			if (commonOrder != null) {
+				if (commonOrder.getState() == CommonOrder.STATE_FK) {
+					CommonOrder updateOrder = new CommonOrder(commonOrder.getId());
+					updateOrder.setState(CommonOrder.STATE_SX);
+					updateOrder.setUpdateTime(new Date());
+					commonOrderService.updateByPrimaryKeySelective(updateOrder);
+				}
+			}
+		}
+
+		HongBaoV2 hongBao = hongBaoV2Service.selectByPrimaryKey(hongBaoId);
+		if (hongBao == null || hongBao.getState() == HongBaoV2.STATE_SHIXIAO)
+			return;
+
 		HongBaoV2 v2 = new HongBaoV2(hongBaoId);
 		v2.setState(HongBaoV2.STATE_SHIXIAO);
 		v2.setBeizhu(beiZhu);
@@ -1261,8 +1278,8 @@
 				hongBaoV2Service.updateByPrimaryKeySelective(update);
 			}
 		// TODO 鍟嗗鍏冲簵璺戣矾闇�瑕佽禒閫侀噾甯�
-//		 userSystemCouponService.rewardCouponWin(uid,
-//		 UserSystemCoupon.SOURCE_SYSTEM_PUSH, 1, true, new BigDecimal("31"));
+		// userSystemCouponService.rewardCouponWin(uid,
+		// UserSystemCoupon.SOURCE_SYSTEM_PUSH, 1, true, new BigDecimal("31"));
 	}
 
 	@Transactional

--
Gitblit v1.8.0