fix

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

@@ -2688,10 +2688,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (goodsDon.getIsThirdGoods()) {
 			return;
 		}
-		//存在余额
-		deductBalancePayOrderMoney(orderDon, balance, user);
 		//存在银河币
 		deductGalaxyCoinPayOrderMoney(orderDon, sku.getPrice(), galaxyCoin, user);
+		//存在余额
+		deductBalancePayOrderMoney(orderDon, balance, user);
 	}
 
 	public void deductGalaxyCoinPayOrderMoney(OrderDon orderDon, BigDecimal renewSkuDiscountPrice, BigDecimal toUseGalaxyCoin, User user) {
@@ -4390,10 +4390,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//虚拟商品订单,是否是分销订单
 		setDistributeOrderMark(orderDon, goodsDon.getType(), user.getId());
 
-		//存在余额
-		deductBalancePayOrderMoney(orderDon, payRequest.getBalance(), user);
 		//存在银河币
 		deductGalaxyCoinPayOrderMoney(orderDon, discountPrice, payRequest.getGalaxyCoin(), user);
+		//存在余额
+		deductBalancePayOrderMoney(orderDon, payRequest.getBalance(), user);
 
 		orderDonMapper.insert(orderDon);
 		//记录续费升级的规格
@@ -4528,14 +4528,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			//虚拟商品订单,是否是分销订单
 			setDistributeOrderMark(orderDon, goodsDon.getType(), user.getId());
 		}
+		//存在银河币
+		deductGalaxyCoinPayOrderMoney(orderDon, orderDonMoney, orderPayRequest.getGalaxyCoin(), user);
 		BigDecimal balance = orderPayRequest.getBalance();
 		//存在余额
 		deductBalancePayOrderMoney(orderDon, balance, user);
 		orderDon.setPayDesc(goodsDon.getPayDesc());
 		//设置订单支付商品信息
 		setOrderDonPayTile(null, null, null, orderDon, goodsDon, sku, null);
-		//存在银河币
-		deductGalaxyCoinPayOrderMoney(orderDon, orderDonMoney, orderPayRequest.getGalaxyCoin(), user);
 		this.saveOrUpdate(orderDon);
 		if (orderDon.getStatus() == OrderDon.Status.noPayment) {
 			jobManager.addJob(EXPIRY_TIME, () -> {

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

@@ -466,11 +466,11 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 	}
 
 	private void deductOrderMoney(VipOrderDon orderDon, User user, VipOrderDonPayReq payRequest, BigDecimal actuallyPayMoney) {
+		//存在银河币
+		deductGalaxyCoinPayOrderMoney(orderDon, payRequest.getGalaxyCoin(), user, actuallyPayMoney);
 		BigDecimal balance = payRequest.getBalance();
 		//存在余额
 		deductBalancePayOrderMoney(orderDon, balance, user);
-		//存在银河币
-		deductGalaxyCoinPayOrderMoney(orderDon, payRequest.getGalaxyCoin(), user, actuallyPayMoney);
 	}
 
 	public void deductGalaxyCoinPayOrderMoney(VipOrderDon orderDon, BigDecimal toUseGalaxyCoin, User user, BigDecimal actuallyPayMoney) {