fix

netflix-dao/src/main/java/com/cyksj/model/views/NanoPackageView.java

@@ -20,9 +20,4 @@ public class NanoPackageView {
 	 * nano规格
 	 */
 	private List<GoodsDonSkuView> skus;
-
-	/**
-	 * 升级套餐
-	 */
-	private List<RenewUpgradePackageFrontView> upgrades;
 }

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

@@ -1,11 +1,8 @@
 package com.cyksj.web.controller.nano;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.Constant;
-import com.cyksj.common.util.Jsons;
-import com.cyksj.common.util.StringUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.dto.UserSharedDto;
 import com.cyksj.enums.GatewayResponse;
@@ -17,7 +14,6 @@ import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.cyksj.model.views.NanoPackageView;
-import com.cyksj.model.views.RenewUpgradePackageFrontView;
 import com.cyksj.service.user.UserBindRelationService;
 import com.cyksj.service.user.UserService;
 import com.cyksj.web.util.StpUserUtil;
@@ -31,11 +27,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
+ * server/nano推广
  * Nano推广控制器
  * 项目名: yhlxj11111111
  * 文件名: NanoController
@@ -81,38 +77,6 @@ public class NanoController {
 	public Result<NanoPackageView> getNanoPackages(String dsCode) {
 		Long userId = StpUserUtil.getUserIdAfterLogin();
 		NanoPackageView nanoPackageView = new NanoPackageView();
-		if (userId != null) {
-			List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
-			NanoUserQuota user = nanoUserQuotaMapper.selectOne(Wrappers.lambdaQuery(NanoUserQuota.class)
-					.in(NanoUserQuota::getUid, userIdList)
-					.last("limit 1"));
-			if (user != null) {
-				GroupsRelation relation = relationMapper.selectById(user.getRelationId());
-				if (relation != null) {
-					GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
-					if (groupsTrips != null) {
-						Long skuId = groupsTrips.getSkuId();
-						List<RenewUpgradePackageFrontView> renewUpgradePackageFrontViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.class, MapUtils.builder().field(RenewUpgradePackageFrontView::getSkuId, skuId).build());
-						renewUpgradePackageFrontViews.forEach(renew -> {
-							try {
-								List<Long> upgradeSkuIds = Jsons.parseList(renew.getUpgradeSkuIds(), Long.class);
-								List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = new ArrayList<>();
-								if (CollUtil.isNotEmpty(upgradeSkuIds)) {
-									renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, MapUtils.builder()
-											//高套餐配额
-											.field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, upgradeSkuIds).op(Operator.InList)
-											.build());
-								}
-								renew.setRenewSkus(renewSkuViews);
-							} catch (Exception e) {
-								log.error("处理nano升级套餐失败:{}", StringUtil.getErrorText(e));
-							}
-						});
-						nanoPackageView.setUpgrades(renewUpgradePackageFrontViews);
-					}
-				}
-			}
-		}
 		List<GoodsDonSkuView> goodsDonSkuViews = beanSearcher.searchAll(GoodsDonSkuView.class, MapUtils.builder().field(GoodsDonSkuView::getGoodsId, Constant.NANO_GOODS_ID).field(GoodsDonSkuView::getUserOwns).op(Operator.IsNull).build());
 		//渠道推广
 		setNanoSkuCouponInfo(dsCode, userId, goodsDonSkuViews);