admin 增加商城新banner功能

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -87,8 +87,9 @@ public class GoblinRedisConst {
     public static final String STORE_NOTICE = PREFIX.concat("store_ntc:");
 
     /* ----------------------------------------------------------------- */
-    public static final String FRONT_TOP_BANNER = PREFIX.concat("front_top_banner");  //前端顶部banner
-    public static final String FRONT_MIDDLE_BANNER = PREFIX.concat("front_middle_banner");  //前端中部banner
+    public static final String FRONT_TOP_BANNER = PREFIX.concat("front_top_banner");  //前端顶部banner（旧版 bannerType=1）
+    public static final String FRONT_MIDDLE_BANNER = PREFIX.concat("front_middle_banner");  //前端中部banner（bannerType=2）
+    public static final String FRONT_NEW_TOP_BANNER = PREFIX.concat("front_new_top_banner");  //前端新版顶部banner（bannerType=3）
     public static final String FRONT_NAVIGATION = PREFIX.concat("front_navigation");  //前端banner
     public static final String FRONT_HOTWORD = PREFIX.concat("front_hot_word");  //前端banner
     public static final String FRONT_HOTWORD_INDEX = PREFIX.concat("front_hot_word_index");  //前端banner index

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinFrontBannerController.java

@@ -134,6 +134,8 @@ public class GoblinFrontBannerController extends BaseController {
         logger.info("bannerResult,{}",bannerResult);
         boolean bannerMiddle=goblinFrontBannerService.middle();
         logger.info("banner中部{}",bannerMiddle);
+        boolean bannerNewTop=goblinFrontBannerService.onlineNewTopBanner();
+        logger.info("banner新版顶部{}",bannerNewTop);
         boolean hotWordResult=goblinFrontHotWordService.online();
         logger.info("热词,{}",hotWordResult);
         boolean navigationResult=goblinFrontNavigationService.online();
@@ -151,7 +153,7 @@ public class GoblinFrontBannerController extends BaseController {
         logger.debug("新品推荐{}",recommendResult);
 /*        boolean hejiReult=goblinFrontCompilationsService.online();
         logger.info("合集{}",hejiReult);*/
-        if (bannerResult&&hotWordResult&&navigationResult&bannerMiddle&&selectGoods&&moudleIndexResult&&cubeResult ) {
+        if (bannerResult&&hotWordResult&&navigationResult&bannerMiddle&&selectGoods&&moudleIndexResult&&cubeResult&&bannerNewTop) {
             return success("操作成功");
         } else {
             return error("操作失败");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/index.html

@@ -233,6 +233,23 @@
             }
             modalPx()
         })
+        function openTopBannerPicker() {
+            layer.open({
+                type: 1,
+                title: '选择顶部Banner类型',
+                area: ['320px', '180px'],
+                content: '<div style="padding:24px 20px;">' +
+                    '<p style="margin-bottom:16px;color:#555;">请选择要编辑的顶部Banner版本：</p>' +
+                    '<div style="display:flex;gap:12px;">' +
+                    '<button class="btn btn-default" style="flex:1;height:48px;" onclick="layer.closeAll();$.modal.open(\'旧版顶部Banner\', prefix2+\'/topBanner?id=6\',900,560,cancel)">' +
+                    '旧版 Banner</button>' +
+                    '<button class="btn btn-primary" style="flex:1;height:48px;" onclick="layer.closeAll();$.modal.open(\'新版顶部Banner\', prefix2+\'/topBanner?id=3\',900,560,cancel)">' +
+                    '新版 Banner</button>' +
+                    '</div></div>',
+                btn: false
+            });
+        }
+
         function goArea (num) {
             switch(num) {
                 case 1:
@@ -244,8 +261,7 @@
                     // $.modal.openTab('商品搜索', prefix2 + "/searchStore?id=" + 1212)
                     break;
                 case 6:
-                    $.modal.open('顶部banner', prefix2 + "/topBanner?id=" + num,900,560, cancel)
-                    // $.modal.openTab('顶部banner', prefix2 + "/topBanner?id=" + num)
+                    openTopBannerPicker();
                     break;
                 case 2:
                     $.modal.open('活动banner', prefix2 + "/topBanner?id=" + num,900,560, cancel)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/homeSet/topBanner.html

@@ -194,8 +194,13 @@
                 $("#tags").hide();
                 $("#activeTags").show();
                 $("#showMiddleBanner").show();
+            } else if (type == 3) {
+                type = 3;
+                $("#tags").show();
+                $("#activeTags").hide();
+                $("#tall").html('新版顶部BANNER（bannerType=3）');
             } else {
-                type = 1
+                type = 1;
                 $("#tags").show();
                 $("#activeTags").hide();
             }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontBannerServiceImpl.java

@@ -209,7 +209,32 @@ public class GoblinFrontBannerServiceImpl extends ServiceImpl<GoblinFrontBannerM
             redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_MIDDLE_BANNER,list);
         }
         return true;
+    }
 
+    public boolean onlineNewTopBanner(){
+        LambdaQueryWrapper<GoblinFrontBanner> queryWrapper = Wrappers.lambdaQuery(GoblinFrontBanner.class);
+        queryWrapper.ne(GoblinFrontBanner::getDelTag,1);
+        queryWrapper.eq(GoblinFrontBanner::getBannerType,3);
+        queryWrapper.orderByAsc(GoblinFrontBanner::getIndexs);
+        List<GoblinFrontBanner> list=goblinFrontBannerMapper.selectList(queryWrapper);
+        if(list.size()>0){
+            //mongodb
+            for(GoblinFrontBanner goblinFrontBanner: list){
+                GoblinFrontBanner goblinFrontBanner1=mongoTemplate.findOne(Query.query(Criteria.where("bannerId").is(goblinFrontBanner.getBannerId())), GoblinFrontBanner.class, GoblinFrontBanner.class.getSimpleName());
+                if(null==goblinFrontBanner1){
+                    mongoTemplate.save(goblinFrontBanner,GoblinFrontBanner.class.getSimpleName());
+                }else{
+                    BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(goblinFrontBanner)));
+                    mongoTemplate.getCollection(GoblinFrontBanner.class.getSimpleName()).updateOne(
+                            Query.query(Criteria.where("bannerId").is(goblinFrontBanner.getBannerId())).getQueryObject(),
+                            orderObject
+                    );
+                }
+            }
+        }
+        //redis 无论有无数据都刷新（支持清空情况）
+        redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_NEW_TOP_BANNER,list);
+        return true;
     }
 
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinFrontController.java

@@ -51,6 +51,12 @@ public class GoblinFrontController {
         return ResponseDto.success(goblinFrontService.getMiddleBanner());
     }
 
+    @GetMapping("getNewTopBanner")
+    @ApiOperation("获取新版顶部banner（bannerType=3，新版App专用）")
+    public ResponseDto<ArrayList<GoblinFrontBannerVo>> getNewTopBanner() {
+        return ResponseDto.success(goblinFrontService.getNewTopBanner());
+    }
+
     @GetMapping("getHotWord")
     @ApiOperation("获得热词")
     public ResponseDto<GoblinFrontHotWord> getHotWord() {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -209,6 +209,35 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         return list1;
     }
 
+    public ArrayList<GoblinFrontBannerVo> getNewTopBanner() {
+        List<GoblinFrontBanner> list = goblinRedisUtils.getNewTopBanner();
+        if (null == list) {
+            return null;
+        }
+        LocalDateTime nowTime = LocalDateTime.now();
+        ArrayList<GoblinFrontBanner> goblinFrontBannerArrayList = ObjectUtil.getGoblinFrontBannerArrayList();
+        for (GoblinFrontBanner goblinFrontBanner : list) {
+            if (null != goblinFrontBanner.getEndTime()) {
+                if (nowTime.isAfter(goblinFrontBanner.getEndTime())) {
+                } else {
+                    if (nowTime.isBefore(goblinFrontBanner.getStartTime())) {
+                    } else {
+                        goblinFrontBannerArrayList.add(goblinFrontBanner);
+                    }
+                }
+            } else {
+                goblinFrontBannerArrayList.add(goblinFrontBanner);
+            }
+        }
+        ArrayList<GoblinFrontBannerVo> list1 = ObjectUtil.goblinFrontBannerVoArrayList();
+        for (GoblinFrontBanner goblinFrontBanner : goblinFrontBannerArrayList) {
+            GoblinFrontBannerVo goblinFrontBannerVo = GoblinFrontBannerVo.getNew();
+            BeanUtils.copyProperties(goblinFrontBanner, goblinFrontBannerVo);
+            list1.add(goblinFrontBannerVo);
+        }
+        return list1;
+    }
+
     @Override
     public GoblinFrontHotWord getHotWord() {
         List<GoblinFrontHotWord> list = goblinRedisUtils.getHotWord();

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -1604,6 +1604,12 @@ public class GoblinMongoUtils {
                 GoblinFrontBanner.class, GoblinFrontBanner.class.getSimpleName());
     }
 
+    public List<GoblinFrontBanner> getNewTopBanner() {
+        Query query = Query.query(Criteria.where("delTag").is(0).and("bannerType").is(3));
+        return mongoTemplate.find(query,
+                GoblinFrontBanner.class, GoblinFrontBanner.class.getSimpleName());
+    }
+
     public List<GoblinFrontHotWord> getHotWord() {
         Query query = Query.query(Criteria.where("delTag").is(0));
         return mongoTemplate.find(query,

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -1834,6 +1834,15 @@ public class GoblinRedisUtils {
         return vo;
     }
 
+    public List<GoblinFrontBanner> getNewTopBanner() {
+        List<GoblinFrontBanner> vo = (List<GoblinFrontBanner>) redisUtil.get(GoblinRedisConst.FRONT_NEW_TOP_BANNER);
+        if (null == vo) {
+            //降级
+            return goblinMongoUtils.getNewTopBanner();
+        }
+        return vo;
+    }
+
     // 热词降级
     public List<GoblinFrontHotWord> getHotWord() {
         List<GoblinFrontHotWord> vo = (List<GoblinFrontHotWord>) redisUtil.get(GoblinRedisConst.FRONT_HOTWORD);