zoujiajian 1 éve
szülő
commit
9dbadcb273

+ 6 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -2960,6 +2960,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (orderDon.getBalance().compareTo(BigDecimal.ZERO) > 0) {
 			userBenefitsService.recordBalanceBySource(orderDon.getUserId(), orderDon.getBalance().negate(), UserBalanceSourceRecord.Source.payment, orderDon.getId(), goodsDon.getTitle() + UserBalanceSourceRecord.Source.payment.getDesc(), null, null);
 		}
+		//是否需要返回银河币
+		AtomicBoolean isNeedReturnGalaxyCoin = new AtomicBoolean(Boolean.TRUE);
 
 		TASK_POOL.execute(() -> {
 			try {
@@ -3008,6 +3010,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 							giftCardUserPayRecord(giftCardOrderRelate.getGcPayDetail(), orderDon);
 						}
 					}
+					isNeedReturnGalaxyCoin.set(Boolean.FALSE);
 				}
 				//下级渠道目标额达标 提成金额发放
 				sendSubDistributeRewards(orderDon);
@@ -3101,7 +3104,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//扣除下单银河币
 		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.ordinary);
 		//银河币返回
-		returnGalaxyCoin(orderDon);
+		if (isNeedReturnGalaxyCoin.get()) {
+			returnGalaxyCoin(orderDon);
+		}
 	}
 
 	private void handleUserMirrorSHopOrderDon(OrderDon orderDon) throws Exception {