zoujiajian 9 meses atrás
pai
commit
3d6e54c7c8

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

@@ -1383,7 +1383,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setRealMoney(orderDon.getMoney());
 		//独立规格续费升级
 		RenewUpgradePackage renewUpgradeIndependentPackage = null;
-		if ((payRequest.getPackageId() != null || payRequest.getOriginalOrderId() != null) && sku.getNum() == 1) {
+		if ((payRequest.getPackageId() != null || payRequest.getOriginalOrderId() != null) && sku.getNum() != null && sku.getNum() == 1) {
 			renewUpgradeIndependentPackage = renewUpgradePackageMapper.selectOne(Wrappers.lambdaQuery(RenewUpgradePackage.class)
 					.eq(RenewUpgradePackage::getSkuId, tripsSkuId)
 					.apply("JSON_CONTAINS(upgrade_sku_ids,'\"" + renewSkuId + "\"')")
@@ -1608,7 +1608,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 		if (orderDon.getOrderType() == 1 && StrUtil.isNotEmpty(buyerId)) {
 			//近一个月同一买家id 只能购买一次 多人 非镜像
-			if (orderDon.getGoodsId() == 26l && sku.getNum() != 1 && !sku.getIsMirror()) {
+			if (orderDon.getGoodsId() == 26l && sku.getNum() != null && sku.getNum() != 1 && !sku.getIsMirror()) {
 				List<Long> userIdList = userBindRelationService.getRelationUserIdList(orderDon.getUserId(), null);
 				Integer count = orderDonMapper.selectCount(Wrappers.lambdaQuery(OrderDon.class)
 						.ne(OrderDon::getId, orderDon.getId())
@@ -1945,7 +1945,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				Account account = null;
 				if (envCommonService.isPrdEnv() && order.getOrderType() == 2) {
 					//ChatGPT plus 独立和Midjourney 独立有人续费了发短信
-					if (Constant.AI_goodsIds.contains(order.getGoodsId()) && sku.getNum() == 1) {
+					if (Constant.AI_goodsIds.contains(order.getGoodsId()) && sku.getNum() != null && sku.getNum() == 1) {
 						try {
 							String accountStr = StrUtil.EMPTY;
 							account = accountMapper.selectById(groupsTrips.getAccountId());
@@ -3339,9 +3339,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 
 		//GPT独立会员续费 若为代充类型 同步代充次数
-		if (orderDon.getGoodsId() == Constant.GPT_PLUS_GID && sku.getNum() == 1) {
+		if (orderDon.getGoodsId() == Constant.GPT_PLUS_GID && sku.getNum() != null && sku.getNum() == 1) {
 			incrGroupsRelationRechargeRemainIfRecharge(orderDon.getRelationId(), sku.getMonths(), orderDon.getOrderType());
-			
+
 			// GPT独立会员购买,赠送sora邀请码
 			try {
 				soraCodeFrontService.grantSoraCodeForGptMember(orderDon.getUserId(), orderDon.getId());