Merge branch 'renew_upgrade' into pre

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

@@ -3765,14 +3765,21 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setPayTitle(payTitle.toString());
 		String donNo = SEQUENCE.nextId().toString();
 		orderDon.setOrderNo(donNo);
+		orderDon.setStatus(OrderDon.Status.noPayment);
 
 		//虚拟商品订单,是否是分销订单
 		setDistributeOrderMark(orderDon, goodsDon.getType(), user.getId());
 
+		//存在余额
+		deductBalancePayOrderMoney(orderDon, payRequest.getBalance(), user);
+
 		orderDonMapper.insert(orderDon);
 		//记录续费升级的规格
 		recordRenewOrderDon(orderDon, renewUpgradePackage);
 
+		jobManager.addJob(EXPIRY_TIME, () -> {
+			closeOrder(orderDon.getId(), null);
+		});
 		return orderDon;
 	}