zoujiajian 2 년 전
부모
커밋
b8f49d1c1c
1개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 6
      netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

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

@@ -1214,18 +1214,18 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getBalance(), UserBalanceSourceRecord.Source.close, orderDon.getYhsId());
 					}
 
-					//返还银河币
-					BigDecimal galaxycoin = orderDon.getGalaxycoin();
-					if (galaxycoin.compareTo(BigDecimal.ZERO) > 0) {
-						userBenefitsService.updateGalaxycoin(orderDon.getUserId(), orderDon.getMOid(), galaxycoin, UserGalaxycoinRecord.Source.close);
-					}
-
 					//是否是礼品卡 现金支付订单
 					BigDecimal gcCash = orderDon.getGcCash();
 					if (gcCash != null && gcCash.compareTo(BigDecimal.ZERO) > 0) {
 						giftCardOrderUseRecordService.returnGiftCardCash(orderDon.getId());
 					}
 				});
+
+				//返还银河币
+				BigDecimal galaxycoin = orderMasterDon.getGalaxycoin();
+				if (galaxycoin.compareTo(BigDecimal.ZERO) > 0) {
+					userBenefitsService.updateGalaxycoin(orderMasterDon.getUserId(), orderMasterDon.getId(), galaxycoin, UserGalaxycoinRecord.Source.close);
+				}
 			}
 		}
 	}