Merge branch 'mj' into dev

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

@@ -3157,30 +3157,30 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				payRequest.setDonMoney(upgradePackage.getPrice());
 			}
 			MidjourneyUser midjourneyUser = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class).eq(MidjourneyUser::getRelationId, payRequest.getRelationId()));
-			if (midjourneyUser != null){
-
-				String donNo = SEQUENCE.nextId().toString();
-				UpgradeOrderDon upgradeOrderDon = new UpgradeOrderDon();
-				upgradeOrderDon.setOrderNo(donNo);
-				upgradeOrderDon.setUserId(payRequest.getUserId());
-				upgradeOrderDon.setOriginalOrderId(payRequest.getOriginalOrderId());
-				upgradeOrderDon.setRelationId(payRequest.getRelationId());
-				upgradeOrderDon.setPackageId(payRequest.getPackageId());
-				upgradeOrderDon.setGoodsId(goodsDonSku.getGoodsId());
-				upgradeOrderDon.setMoney(payRequest.getDonMoney());
-				upgradeOrderDon.setStatus(UpgradeOrderDon.Status.noPayment);
-				upgradeOrderDon.setType(UpgradeOrderDon.Type.ALI_PAY);
-				upgradeOrderDonMapper.insert(upgradeOrderDon);
-
-				deductUpgradeBalancePayOrderMoney(upgradeOrderDon, payRequest.getBalance(),user );
-
-				if (upgradeOrderDon.getStatus() == UpgradeOrderDon.Status.noPayment) {
-					jobManager.addJob(EXPIRY_TIME, () -> {
-						closeUpgradeOrder(upgradeOrderDon.getId(), null);
-					});
-				}
-				return upgradeOrderDon;
-			}
+			if (midjourneyUser == null){
+				throw BusinessRuntimeException.getInstance("车票未激活Midjourney账号,请先激活");
+			}
+			String donNo = SEQUENCE.nextId().toString();
+			UpgradeOrderDon upgradeOrderDon = new UpgradeOrderDon();
+			upgradeOrderDon.setOrderNo(donNo);
+			upgradeOrderDon.setUserId(payRequest.getUserId());
+			upgradeOrderDon.setOriginalOrderId(payRequest.getOriginalOrderId());
+			upgradeOrderDon.setRelationId(payRequest.getRelationId());
+			upgradeOrderDon.setPackageId(payRequest.getPackageId());
+			upgradeOrderDon.setGoodsId(goodsDonSku.getGoodsId());
+			upgradeOrderDon.setMoney(payRequest.getDonMoney());
+			upgradeOrderDon.setStatus(UpgradeOrderDon.Status.noPayment);
+			upgradeOrderDon.setType(UpgradeOrderDon.Type.ALI_PAY);
+			upgradeOrderDonMapper.insert(upgradeOrderDon);
+
+			deductUpgradeBalancePayOrderMoney(upgradeOrderDon, payRequest.getBalance(),user );
+
+			if (upgradeOrderDon.getStatus() == UpgradeOrderDon.Status.noPayment) {
+				jobManager.addJob(EXPIRY_TIME, () -> {
+					closeUpgradeOrder(upgradeOrderDon.getId(), null);
+				});
+			}
+			return upgradeOrderDon;
 		}
 		return null;
 	}