zoujiajian il y a 11 mois
Parent
commit
334434e5fd

+ 6 - 5
netflix-service/src/main/java/com/cyksj/service/gzh/factory/EventMsgService.java

@@ -274,7 +274,7 @@ public class EventMsgService implements GzhMsgService {
 				}
 			}
 			//查找渠道是否有设置了对应的claude code优惠码
-			handlerSpecialPopularize(sharedId, dsPopularizeId, user);
+			handlerSpecialPopularize(sharedId, dsPopularizeId, user, isNewUser);
 			//每日活跃记录
 			userLoginRecordService.saveUserLoginDayRecord(user.getId());
 			//是否是大学生快递站进来的用户
@@ -382,7 +382,7 @@ public class EventMsgService implements GzhMsgService {
 	/**
 	 * 查找渠道是否有设置了对应的claude code优惠码
 	 */
-	public void handlerSpecialPopularize(Long sharedId, Long dsPopularizeId, User user) {
+	public void handlerSpecialPopularize(Long sharedId, Long dsPopularizeId, User user, Boolean isNewUser) {
 		//查找渠道是否有设置了对应的claude code优惠码
 		if (sharedId != null) {
 			UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, sharedId).eq(UserDistribute::getDeleted, Boolean.TRUE).last("limit 1"));
@@ -429,20 +429,21 @@ public class EventMsgService implements GzhMsgService {
 				//是否是nano 推广
 				if (Constant.NANO_DISTRIBUTE_MARK.equals(userDistributePopularize.getOtherUrl())) {
 					Integer selectCount = couponDistributePopularizeMapper.selectCount(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getDistributeId, userDistribute.getId()).eq(CouponDistributePopularize::getDeleted, Boolean.TRUE).eq(CouponDistributePopularize::getCouponId, Constant.DISTRIBUTE_NANO_COUPON_ID));
-					//是否设置claude cod优惠券
 					if (selectCount > 0) {
 						//设置了 直接发送优惠券
 						Boolean b = couponCommonService.sendCouponToUser(user.getId(), Constant.DISTRIBUTE_NANO_COUPON_ID, 0l, 0l, dsPopularizeId, CouponUser.Channel.manual);
 						if (!b) {
 							return;
 						}
+						if (!isNewUser) {
+							return;
+						}
 						if (redisService.setNx(RedisService.key.NANO_TY_DAY_CARD_KEY.getName() + user.getId(), user.getId(), RedisService.key.NANO_TY_DAY_CARD_KEY.getTimeout())) {
-							//存在Claude code车票不发送体验卡
 							Integer receiveRecord = nanoUserTrialReceiveRecordMapper.selectCount(Wrappers.lambdaQuery(NanoUserTrialReceiveRecord.class).eq(NanoUserTrialReceiveRecord::getUserId, user.getId()));
 							if (receiveRecord > 0) {
 								return;
 							}
-							//发送claude code 体验卡
+							//发送nano 体验卡
 							Long relationId = groupRelationFrontService.getTrialTicketByUserIdAndGoodsId(user.getId(), Constant.DISTRIBUTE_NANO_TRIAL_SKU_ID, 1);
 							recordReceiveNanoRecord(user.getId(), relationId);
 						}

+ 7 - 6
netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -252,7 +252,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 			equipDistributeService.saveDistributionInvitation(sharedId, isNewUser, user.getId());
 		}
 		//处理特殊推广
-		handlerSpecialPopularize(sharedId, dsPopularizeId, user);
+		handlerSpecialPopularize(sharedId, dsPopularizeId, user, isNewUser);
 		//每日活跃记录
 		userLoginRecordService.saveUserLoginDayRecord(user.getId());
 		//是否是大学生快递站进来的用户
@@ -606,7 +606,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 			equipDistributeService.saveDistributionInvitation(sharedId, isNewUser, user.getId());
 		}
 		//查找渠道是否有设置了对应的claude code优惠码
-		handlerSpecialPopularize(sharedId, dsPopularizeId, user);
+		handlerSpecialPopularize(sharedId, dsPopularizeId, user, isNewUser);
 
 		//每日活跃记录
 		userLoginRecordService.saveUserLoginDayRecord(user.getId());
@@ -950,7 +950,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 	/**
 	 * 查找渠道是否有设置了对应的claude code优惠码
 	 */
-	public void handlerSpecialPopularize(Long sharedId, Long dsPopularizeId, User user) {
+	public void handlerSpecialPopularize(Long sharedId, Long dsPopularizeId, User user, Boolean isNewUser) {
 		//查找渠道是否有设置了对应的claude code优惠码
 		if (sharedId != null) {
 			UserDistribute userDistribute = userDistributeMapper.selectOne(Wrappers.lambdaQuery(UserDistribute.class).eq(UserDistribute::getUserId, sharedId).eq(UserDistribute::getDeleted, Boolean.TRUE).last("limit 1"));
@@ -997,20 +997,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 				//是否是nano 推广
 				if (Constant.NANO_DISTRIBUTE_MARK.equals(userDistributePopularize.getOtherUrl())) {
 					Integer selectCount = couponDistributePopularizeMapper.selectCount(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getDistributeId, userDistribute.getId()).eq(CouponDistributePopularize::getDeleted, Boolean.TRUE).eq(CouponDistributePopularize::getCouponId, Constant.DISTRIBUTE_NANO_COUPON_ID));
-					//是否设置claude cod优惠券
 					if (selectCount > 0) {
 						//设置了 直接发送优惠券
 						Boolean b = couponCommonService.sendCouponToUser(user.getId(), Constant.DISTRIBUTE_NANO_COUPON_ID, 0l, 0l, dsPopularizeId, CouponUser.Channel.manual);
 						if (!b) {
 							return;
 						}
+						if (!isNewUser) {
+							return;
+						}
 						if (redisService.setNx(RedisService.key.NANO_TY_DAY_CARD_KEY.getName() + user.getId(), user.getId(), RedisService.key.NANO_TY_DAY_CARD_KEY.getTimeout())) {
-							//存在Claude code车票不发送体验卡
 							Integer receiveRecord = nanoUserTrialReceiveRecordMapper.selectCount(Wrappers.lambdaQuery(NanoUserTrialReceiveRecord.class).eq(NanoUserTrialReceiveRecord::getUserId, user.getId()));
 							if (receiveRecord > 0) {
 								return;
 							}
-							//发送claude code 体验卡
+							//发送nano 体验卡
 							Long relationId = groupRelationFrontService.getTrialTicketByUserIdAndGoodsId(user.getId(), Constant.DISTRIBUTE_NANO_TRIAL_SKU_ID, 1);
 							recordReceiveNanoRecord(user.getId(), relationId);
 						}