fix

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

@@ -653,6 +653,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		this.saveOrUpdate(orderDon);
 
 		Long orderId = orderDon.getId();
+		//使用银河币记录
+		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.ordinary);
 		Long fUid = orderDon.getUserId();
 		if (orderDon.getIsDp() != null && orderDon.getIsDp()) {
 			//保存订单优惠加购规格 关系
@@ -1271,6 +1273,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		this.saveOrUpdate(orderDon);
 
 		Long orderId = orderDon.getId();
+		//使用银河币记录
+		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.ordinary);
 		//礼品卡现金使用记录
 		if (CollUtil.isNotEmpty(orderDon.getGcUseRecords())) {
 			orderDon.getGcUseRecords().forEach(data -> {
@@ -3100,9 +3104,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 		}
 
-		//银河币使用记录
-		//扣除下单银河币
-		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.ordinary);
 		//银河币返回
 		if (isNeedReturnGalaxyCoin.get()) {
 			returnGalaxyCoin(orderDon);
@@ -4022,6 +4023,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 			deductUpgradeBalancePayOrderMoney(upgradeOrderDon, payRequest,user);
 			Long orderId = upgradeOrderDon.getId();
+			//使用银河币记录
+			userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(upgradeOrderDon.getId(), upgradeOrderDon.getUserId(), upgradeOrderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.upgrade);
 			if (upgradeOrderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
 				upgradeOrderDon = upgradeOrderDonMapper.selectById(orderId);
 				unifiedHandlerUpgradeOrderNotify(upgradeOrderDon, upgradePackage);
@@ -4226,9 +4229,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 		}
 
-		//银河币使用记录
-		//扣除下单银河币
-		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.upgrade);
 		//银河币返回
 		returnUpgradeGalaxyCoin(orderDon);
 	}
@@ -4441,6 +4441,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//记录续费升级的规格
 		recordRenewOrderDon(orderDon, renewUpgradePackage, groupsTrips);
 		Long orderId = orderDon.getId();
+		//使用银河币记录
+		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.ordinary);
 		if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
 			orderDon = orderDonMapper.selectById(orderId);
 			unifiedHandlerOrderNotify(orderDon, goodsDon, renewSku);
@@ -4579,6 +4581,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//设置订单支付商品信息
 		setOrderDonPayTile(null, null, null, orderDon, goodsDon, sku, null);
 		this.saveOrUpdate(orderDon);
+		//使用银河币记录
+		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.ordinary);
 		if (orderDon.getStatus() == OrderDon.Status.noPayment) {
 			jobManager.addJob(EXPIRY_TIME, () -> {
 				closeOrder(orderDon.getId(), null);

netflix-service/src/main/java/com/cyksj/service/order/impl/VipOrderDonServiceImpl.java

@@ -188,6 +188,8 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 		this.saveOrUpdate(orderDon);
 
 		Long orderId = orderDon.getId();
+		//使用银河币记录
+		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.vip);
 		//存在抵扣 记录抵扣成功后 需清除车票的ids
 		if (vipMoneyIfDeduct != null) {
 			List<Long> deductRelationIds = vipMoneyIfDeduct.getDeductRelationIds();
@@ -304,6 +306,8 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 		this.saveOrUpdate(orderDon);
 
 		Long orderId = orderDon.getId();
+		//使用银河币记录
+		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.vip);
 		//余额支付订单
 		if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
 			orderDon = getById(orderId);
@@ -427,8 +431,6 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 			this.saveOrUpdate(orderDon);
 		}
 
-		//扣除下单银河币
-		userGalaxyCoinService.handleUserGalaxyCoinOrderNotify(orderDon.getId(), orderDon.getUserId(), orderDon.getOrderNo(), OrderDonGalaxyCoinRecord.Source.vip);
 		//银河币返回
 		returnGalaxyCoin(orderDon);
 	}