fix nano扫码

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

@@ -454,20 +454,19 @@ public class EventMsgService implements GzhMsgService {
 					}
 				}
 			}
-
-			//新用户都送体验卡
-			if (isNano != null && isNano) {
-				if (redisService.setNx(RedisService.key.NANO_TY_DAY_CARD_KEY.getName() + user.getId(), user.getId(), RedisService.key.NANO_TY_DAY_CARD_KEY.getTimeout())) {
-					Integer receiveRecord = nanoUserTrialReceiveRecordMapper.selectCount(Wrappers.lambdaQuery(NanoUserTrialReceiveRecord.class).eq(NanoUserTrialReceiveRecord::getUserId, user.getId()));
-					if (receiveRecord > 0) {
-						return;
-					}
-					//发送nano 体验卡
-					Long relationId = groupRelationFrontService.getTrialTicketByUserIdAndGoodsId(user.getId(), Constant.DISTRIBUTE_NANO_TRIAL_SKU_ID, 2);
-					recordReceiveNanoRecord(user.getId(), relationId);
-					//创建nano user
-					createNanoUser(user.getId(), relationId, goodsDonSkuMapper.selectById(Constant.DISTRIBUTE_NANO_TRIAL_SKU_ID));
+		}
+		//新用户都送体验卡
+		if (isNano != null && isNano) {
+			if (redisService.setNx(RedisService.key.NANO_TY_DAY_CARD_KEY.getName() + user.getId(), user.getId(), RedisService.key.NANO_TY_DAY_CARD_KEY.getTimeout())) {
+				Integer receiveRecord = nanoUserTrialReceiveRecordMapper.selectCount(Wrappers.lambdaQuery(NanoUserTrialReceiveRecord.class).eq(NanoUserTrialReceiveRecord::getUserId, user.getId()));
+				if (receiveRecord > 0) {
+					return;
 				}
+				//发送nano 体验卡
+				Long relationId = groupRelationFrontService.getTrialTicketByUserIdAndGoodsId(user.getId(), Constant.DISTRIBUTE_NANO_TRIAL_SKU_ID, 2);
+				recordReceiveNanoRecord(user.getId(), relationId);
+				//创建nano user
+				createNanoUser(user.getId(), relationId, goodsDonSkuMapper.selectById(Constant.DISTRIBUTE_NANO_TRIAL_SKU_ID));
 			}
 		}
 	}

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsPopularizeController.java

@@ -290,6 +290,7 @@ public class CpsPopularizeController {
 		list.forEach(goods->{
 			LambdaQueryWrapper<GoodsDonSku> wrapper = Wrappers.lambdaQuery(GoodsDonSku.class)
 					.eq(GoodsDonSku::getGoodsId, goods.getId())
+					.isNull(GoodsDonSku::getUserOwns)
 					.eq(GoodsDonSku::getStatus, Boolean.TRUE);
 			if (goods.getIsSkuDistribute()) {
 				//开启规格分销 需要排除那些为0的规格

netflix-web/src/main/java/com/cyksj/web/controller/nano/NanoController.java

@@ -98,7 +98,11 @@ public class NanoController {
 	public Result<NanoPackageView> getNanoPackages(String dsCode) {
 		Long userId = StpUserUtil.getUserIdAfterLogin();
 		NanoPackageView nanoPackageView = new NanoPackageView();
-		List<GoodsDonSkuView> goodsDonSkuViews = beanSearcher.searchAll(GoodsDonSkuView.class, MapUtils.builder().field(GoodsDonSkuView::getGoodsId, Constant.NANO_GOODS_ID).field(GoodsDonSkuView::getUserOwns).op(Operator.IsNull).build());
+		List<GoodsDonSkuView> goodsDonSkuViews = beanSearcher.searchAll(GoodsDonSkuView.class, MapUtils.builder()
+				.field(GoodsDonSkuView::getGoodsId, Constant.NANO_GOODS_ID)
+				.field(GoodsDonSkuView::getUserOwns).op(Operator.IsNull)
+				.field(GoodsDonSkuView::getGoodsDonSkuStatus, Boolean.TRUE)
+				.field(GoodsDonSkuView::getGoodsDonStatus, Boolean.TRUE).build());
 		//渠道推广
 		setNanoSkuCouponInfo(dsCode, userId, goodsDonSkuViews);
 		nanoPackageView.setSkus(goodsDonSkuViews);