Merge branch 'year_recharge_api' into pre

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -45,7 +45,7 @@ public interface Constant {
 	/**
 	 * 默认头像
 	 */
-	String DEFAULT_HEAD_IMG = "https://cdn2.yicanggongyi.com/yinhe/icon/index/avatar.png";
+	String DEFAULT_HEAD_IMG = "https://cdn2.liuliangbang.vip/yinhe/icon/index/avatar.png";
 
 	/**
 	 * 普通奖池积分配置key
@@ -505,12 +505,12 @@ public interface Constant {
 	/**
 	 * 镜像店铺默认LOGO
 	 */
-	String USER_MIRROR_SHOP_DEFAULT_LOGO = "https://cdn2.yicanggongyi.com/picture/f6e48d2c854bd38a2ed2cc7d319b524f-1731038450046.webp";
+	String USER_MIRROR_SHOP_DEFAULT_LOGO = "https://cdn2.liuliangbang.vip/picture/f6e48d2c854bd38a2ed2cc7d319b524f-1731038450046.webp";
 
 	/**
 	 * 镜像店铺用户头像
 	 */
-	String USER_MIRROR_SHOP_USER_DEFAULT_IMG = "https://cdn2.yicanggongyi.com/picture/08944798d95e42f62f3bb63d8109dcf1-1732169951288.png";
+	String USER_MIRROR_SHOP_USER_DEFAULT_IMG = "https://cdn2.liuliangbang.vip/picture/08944798d95e42f62f3bb63d8109dcf1-1732169951288.png";
 
 	/**
 	 * MJ

netflix-common/src/main/java/com/cyksj/common/constant/RandomConstant.java

@@ -35,24 +35,24 @@ public class RandomConstant {
 			"快乐飞行员",
 			"悠闲游戏者");
 
-	public final static List<String> imgs = List.of("https://cdn2.yicanggongyi.com/picture/3d31de8deaa69d860483dbf4b5bdf495-1682238950376.png",
-			"https://cdn2.yicanggongyi.com/picture/4d8782126a98b0f35f4313011b4c56f7-1682238950431.png",
-			"https://cdn2.yicanggongyi.com/picture/438892d60ec935e174e5c6c59ca02542-1682238950278.png",
-			"https://cdn2.yicanggongyi.com/picture/b01f30f75283585d613136e339781962-1682238950404.png",
-			"https://cdn2.yicanggongyi.com/picture/043dd1a9457c4feadb3c6627b3abd152-1682238950316.png",
-			"https://cdn2.yicanggongyi.com/picture/c08fc448e0b494b9ff2b62dc4e3660f6-1682238950349.png",
-			"https://cdn2.yicanggongyi.com/picture/47cb6ea39a5005f6fddb1413bdc81ea7-1682238950532.png",
-			"https://cdn2.yicanggongyi.com/picture/40794090747d848ca142473aa2e3ca6a-1682238950559.png",
-			"https://cdn2.yicanggongyi.com/picture/bb6f0ab1406d1fb9bbed32eef0168ba7-1682238950474.png",
-			"https://cdn2.yicanggongyi.com/picture/e904769134d846046e2d3d4c84090875-1682239434345.png",
-			"https://cdn2.yicanggongyi.com/picture/f2e65a63af190b592b3166698d54adaa-1682239434318.png",
-			"https://cdn2.yicanggongyi.com/picture/e79c30bd0740ee66a70ea26ba2c73d50-1682239434256.png",
-			"https://cdn2.yicanggongyi.com/picture/98902342b15406fe3d170d8d4aad6f49-1682239434286.png",
-			"https://cdn2.yicanggongyi.com/picture/d28416360ed022e8f27767c1fef6bd69-1682239434384.png",
-			"https://cdn2.yicanggongyi.com/picture/c7bc9ba763d3ec97e0aed906e974af9d-1682239434469.png",
-			"https://cdn2.yicanggongyi.com/picture/7c017d1910efd32f56f3ef1b10c574d5-1682239434116.png",
-			"https://cdn2.yicanggongyi.com/picture/aa5333d89cf1dafa11905c86ba10948e-1682239434416.png",
-			"https://cdn2.yicanggongyi.com/picture/2fdea3f9b383e594a0a3b3b908b2eac6-1682239434498.png");
+	public final static List<String> imgs = List.of("https://cdn2.liuliangbang.vip/picture/3d31de8deaa69d860483dbf4b5bdf495-1682238950376.png",
+			"https://cdn2.liuliangbang.vip/picture/4d8782126a98b0f35f4313011b4c56f7-1682238950431.png",
+			"https://cdn2.liuliangbang.vip/picture/438892d60ec935e174e5c6c59ca02542-1682238950278.png",
+			"https://cdn2.liuliangbang.vip/picture/b01f30f75283585d613136e339781962-1682238950404.png",
+			"https://cdn2.liuliangbang.vip/picture/043dd1a9457c4feadb3c6627b3abd152-1682238950316.png",
+			"https://cdn2.liuliangbang.vip/picture/c08fc448e0b494b9ff2b62dc4e3660f6-1682238950349.png",
+			"https://cdn2.liuliangbang.vip/picture/47cb6ea39a5005f6fddb1413bdc81ea7-1682238950532.png",
+			"https://cdn2.liuliangbang.vip/picture/40794090747d848ca142473aa2e3ca6a-1682238950559.png",
+			"https://cdn2.liuliangbang.vip/picture/bb6f0ab1406d1fb9bbed32eef0168ba7-1682238950474.png",
+			"https://cdn2.liuliangbang.vip/picture/e904769134d846046e2d3d4c84090875-1682239434345.png",
+			"https://cdn2.liuliangbang.vip/picture/f2e65a63af190b592b3166698d54adaa-1682239434318.png",
+			"https://cdn2.liuliangbang.vip/picture/e79c30bd0740ee66a70ea26ba2c73d50-1682239434256.png",
+			"https://cdn2.liuliangbang.vip/picture/98902342b15406fe3d170d8d4aad6f49-1682239434286.png",
+			"https://cdn2.liuliangbang.vip/picture/d28416360ed022e8f27767c1fef6bd69-1682239434384.png",
+			"https://cdn2.liuliangbang.vip/picture/c7bc9ba763d3ec97e0aed906e974af9d-1682239434469.png",
+			"https://cdn2.liuliangbang.vip/picture/7c017d1910efd32f56f3ef1b10c574d5-1682239434116.png",
+			"https://cdn2.liuliangbang.vip/picture/aa5333d89cf1dafa11905c86ba10948e-1682239434416.png",
+			"https://cdn2.liuliangbang.vip/picture/2fdea3f9b383e594a0a3b3b908b2eac6-1682239434498.png");
 
 	public static String getName() {
 		int i = RandomUtil.randomInt(names.size());

netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -969,7 +969,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             chatgptUser.setExpireTime(dateTime.toJdkDate());
             chatgptUser.setIsPlus(1);
             chatgptUser.setName("银河体验卡用户");
-            chatgptUser.setImg("https://cdn2.yicanggongyi.com/yinhe/icon/index/avatar.png");
+            chatgptUser.setImg("https://cdn2.liuliangbang.vip/yinhe/icon/index/avatar.png");
             chatgptUser.setUserToken(UUID.randomUUID().toString());
             chatgptUserMapper.insert(chatgptUser);
         } catch (DuplicateKeyException e) {

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

@@ -253,6 +253,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private static final Integer DEFAULT_API_QUOTA = 2500000;
 
+	private static final Integer YEAR_RECHARGE_API_QUOTA = 25000000;
+
 	@Override
 	public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account, String orderNo, Integer cmt) {
 		User u = userMapper.selectById(userId);
@@ -2859,10 +2861,11 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			if (sourceOrder == null) {
 				throw BusinessRuntimeException.getInstance("不符合领取要求");
 			}
-            Long sourceGoodsId = sourceRelation.getGoodsId();
+			Long sourceGoodsId = sourceRelation.getGoodsId();
             if (!isGptApiQuotaSourceTicket(sourceOrder, sourceGoodsId, sourceSku.getNum())) {
                 throw BusinessRuntimeException.getInstance("当前车票不符合领取条件");
             }
+			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)
@@ -2900,7 +2903,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 						throw BusinessRuntimeException.getInstance("系统繁忙，请重新领取");
 					}
 				}
-				GptActivityRedeemResult redeemResult = requestGptActivityRedeemCode(Constant.AI_API_SVC_DOMAIN, GPT_ACTIVITY_REDEEM_NAME, DEFAULT_API_QUOTA);
+				GptActivityRedeemResult redeemResult = requestGptActivityRedeemCode(Constant.AI_API_SVC_DOMAIN, GPT_ACTIVITY_REDEEM_NAME, quota);
 				record.setRelationId(giftRelation.getId());
 				record.setGoodsId(giftSku.getGoodsId());
                 record.setSourceGoodsId(sourceGoodsId);
@@ -3025,6 +3028,12 @@ 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, 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) {
         TicketRedemptionCodeRecord retryRecord = ticketRedemptionCodeRecordMapper.selectOne(Wrappers.lambdaQuery(TicketRedemptionCodeRecord.class)
                 .in(TicketRedemptionCodeRecord::getUserId, userIds)