getActiveType == 1

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRecommendActiveServiceImpl.java

@@ -7,8 +7,10 @@ import com.github.pagehelper.PageHelper;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.goblin.entity.GoblinGoods;
+import com.liquidnet.service.goblin.entity.GoblinGoodsSku;
 import com.liquidnet.service.goblin.entity.GoblinMix;
 import com.liquidnet.service.goblin.mapper.GoblinGoodsMapper;
+import com.liquidnet.service.goblin.mapper.GoblinGoodsSkuMapper;
 import com.liquidnet.service.goblin.mapper.GoblinMixMapper;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
@@ -46,6 +48,8 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
     @Autowired
     GoblinGoodsMapper goblinGoodsMapper;
     @Autowired
+    GoblinGoodsSkuMapper goblinGoodsSkuMapper;
+    @Autowired
     GoblinMixMapper goblinMixMapper;
 
     @Override
@@ -86,12 +90,12 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
         List<KylinRecommendActive> list = kylinRecommendActiveMapper.selectList(queryWrapper);
         list.forEach(r -> {
             //1NFT2组合购3演出4商品
-            if (r.getActiveType() == 1 || r.getActiveType() == 4) {
-                LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
-                queryWrapperg.eq(GoblinGoods::getSpuId, r.getActiveBindId());
-                GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
-                if (null != goblinGoods) {
-                    r.setName(goblinGoods.getName());
+            if (r.getActiveType() == 1) {
+                LambdaQueryWrapper<GoblinGoodsSku> queryWrapperg = Wrappers.lambdaQuery(GoblinGoodsSku.class);
+                queryWrapperg.eq(GoblinGoodsSku::getSkuId, r.getActiveBindId());
+                GoblinGoodsSku goblinGoodsSku = goblinGoodsSkuMapper.selectOne(queryWrapperg);
+                if (null != goblinGoodsSku) {
+                    r.setName(goblinGoodsSku.getName());
                 }
             } else if (r.getActiveType() == 2) {
                 LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
@@ -107,6 +111,13 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
                 if (null != kylinPerformances) {
                     r.setName(kylinPerformances.getTitle());
                 }
+            } else if (r.getActiveType() == 4) {
+                LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
+                queryWrapperg.eq(GoblinGoods::getSpuId, r.getActiveBindId());
+                GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
+                if (null != goblinGoods) {
+                    r.setName(goblinGoods.getName());
+                }
             }
         });
         return list;
@@ -116,12 +127,12 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
     public KylinRecommendActive getKylinRecommendActiveById(int mid) {
         //获得推荐活动
         KylinRecommendActive kylinRecommendActive = kylinRecommendActiveMapper.selectById(mid);
-        if (kylinRecommendActive.getActiveType() == 1 || kylinRecommendActive.getActiveType() == 4) {
-            LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
-            queryWrapperg.eq(GoblinGoods::getSpuId, kylinRecommendActive.getActiveBindId());
-            GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
-            if (null != goblinGoods) {
-                kylinRecommendActive.setName(goblinGoods.getName());
+        if (kylinRecommendActive.getActiveType() == 1) {
+            LambdaQueryWrapper<GoblinGoodsSku> queryWrapperg = Wrappers.lambdaQuery(GoblinGoodsSku.class);
+            queryWrapperg.eq(GoblinGoodsSku::getSkuId, kylinRecommendActive.getActiveBindId());
+            GoblinGoodsSku goblinGoodsSku = goblinGoodsSkuMapper.selectOne(queryWrapperg);
+            if (null != goblinGoodsSku) {
+                kylinRecommendActive.setName(goblinGoodsSku.getName());
             }
         } else if (kylinRecommendActive.getActiveType() == 2) {
             LambdaQueryWrapper<GoblinMix> queryWrapperm = Wrappers.lambdaQuery(GoblinMix.class);
@@ -137,6 +148,13 @@ public class KylinRecommendActiveServiceImpl extends ServiceImpl<KylinRecommendA
             if (null != kylinPerformances) {
                 kylinRecommendActive.setName(kylinPerformances.getTitle());
             }
+        } else if (kylinRecommendActive.getActiveType() == 4) {
+            LambdaQueryWrapper<GoblinGoods> queryWrapperg = Wrappers.lambdaQuery(GoblinGoods.class);
+            queryWrapperg.eq(GoblinGoods::getSpuId, kylinRecommendActive.getActiveBindId());
+            GoblinGoods goblinGoods = goblinGoodsMapper.selectOne(queryWrapperg);
+            if (null != goblinGoods) {
+                kylinRecommendActive.setName(goblinGoods.getName());
+            }
         }
         //获得推荐商品
         LambdaQueryWrapper<KylinRecommendActiveRelation> queryWrapper = Wrappers.lambdaQuery(KylinRecommendActiveRelation.class);