소스 검색

fix GPT独立年付领取API50元额度

zoujiajian 1 개월 전
부모
커밋
9de12b9a66
1개의 변경된 파일과 5개의 추가작업 그리고 3개의 파일을 삭제
  1. 5 3
      netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

+ 5 - 3
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -2865,7 +2865,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
             if (!isGptApiQuotaSourceTicket(sourceOrder, sourceGoodsId, sourceSku.getNum())) {
                 throw BusinessRuntimeException.getInstance("当前车票不符合领取条件");
             }
-			Integer quota = isYearRechargeSku(sourceGoodsId, sourceSku.getMonths()) ? YEAR_RECHARGE_API_QUOTA : DEFAULT_API_QUOTA;
+			Integer quota = isYearRechargeSku(sourceGoodsId, sourceSku.getMonths(), sourceSku.getNum()) ? YEAR_RECHARGE_API_QUOTA : DEFAULT_API_QUOTA;
 
             Integer receivedCount = ticketRedemptionCodeRecordMapper.selectCount(Wrappers.lambdaQuery(TicketRedemptionCodeRecord.class)
                     .in(TicketRedemptionCodeRecord::getUserId, userIds)
@@ -3028,8 +3028,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
                 || (Constant.GPT_PLUS_GID.equals(goodsId) && Objects.equals(skuNum, 1))) && orderDon.getCreatedTime().after(DateUtil.parse("2026-05-01"));
     }
 
-    private boolean isYearRechargeSku(Long goodsId, Integer skuMonths) {
-        return Constant.GPT_RECHARGE_GOODS_ID.equals(goodsId) && skuMonths != null && skuMonths >= 12;
+    private boolean isYearRechargeSku(Long goodsId, Integer skuMonths, Integer skuNum) {
+        return (Constant.GPT_RECHARGE_GOODS_ID.equals(goodsId)
+                || (Constant.GPT_PLUS_GID.equals(goodsId) && Objects.equals(skuNum, 1)))
+                && skuMonths != null && skuMonths >= 12;
     }
 
     private GroupsRelation getReusableGptActivityGiftRelation(List<Long> userIds, Long giftSkuId, Long sourceGoodsId) {