From 26f41e1a5c34a3e36c9e73c237e3643e707924ce Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 18 一月 2020 11:36:51 +0800
Subject: [PATCH] 商城订单失效退还红包

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
index 162e62b..f4ba043 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
@@ -91,12 +91,11 @@
 
 	@Resource
 	private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
-	
+
 	@Resource
 	private RedPackForbidService redPackForbidService;
-	
 
-	@Transactional(rollbackFor=Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void addOrder(BanLiShopOrder order) throws BanLiShopOrderException {
 		// 鏌ヨ蹇呰鐨勫弬鏁版槸鍚︽坊鍔�
@@ -224,7 +223,7 @@
 		banLiShopOrderMapper.updateByPrimaryKeySelective(order);
 	}
 
-	@Transactional(rollbackFor=Exception.class)
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void payOrderByHongBao(Long orderId) throws BanLiShopOrderException, RedPackBalanceException {
 		BanLiShopOrder order = banLiShopOrderMapper.selectByPrimaryKeyForUpdate(orderId);
@@ -329,6 +328,7 @@
 		return banLiShopOrderMapper.selectByPrimaryKeyForUpdate(id);
 	}
 
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void invalidOrderByOrderId(Long id, String desc) {
 		// 鍒ゆ柇璁㈠崟鏄惁瀛樺湪
@@ -347,8 +347,8 @@
 					if (isS)// 鏀粯鎴愬姛锛岄噸鏂板彂閫佹敮浠樻垚鍔熸秷鎭�
 					{
 						BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());
-						Message message =MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
-								OrderTopicTagEnum.banLiShopOrderPaid,msg);
+						Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
+								OrderTopicTagEnum.banLiShopOrderPaid, msg);
 						producer.send(message);
 						return;
 					}
@@ -379,8 +379,8 @@
 		if (order.getState() != BanLiShopOrder.STATE_PAID)
 			throw new BanLiShopOrderException(1, "璁㈠崟鏈浜庡緟瀹℃牳鐘舵��");
 
-		Message message =MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.banLiShopOrderRefund,
-			new BanLiShopOrderMQMsg(order.getId(), order.getUid()));
+		Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.banLiShopOrderRefund,
+				new BanLiShopOrderMQMsg(order.getId(), order.getUid()));
 		try {
 			orderTransactionProducer.send(message, new LocalTransactionExecuter() {
 				@Override
@@ -440,9 +440,9 @@
 			throw new BanLiShopOrderException(22, "鍟嗗搧宸蹭笅绾�");
 		}
 
-		if(redPackForbidService.verifyForbid(uid))
+		if (redPackForbidService.verifyForbid(uid))
 			throw new BanLiShopOrderException(25, "绾㈠寘鍔熻兘宸茶灏佺");
-		
+
 		if (pay.getHongBaoPrice() != null && pay.getHongBaoPrice().compareTo(new BigDecimal(0)) > 0) {
 			BigDecimal money = redPackBalanceService.getBalance(uid);
 			if (money.compareTo(pay.getHongBaoPrice()) < 0) {

--
Gitblit v1.8.0