修改秒杀分页那块问题

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinFrontBannerBuildParam.java

 package com.liquidnet.service.goblin.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -50,14 +51,14 @@ public class GoblinFrontBannerBuildParam implements Serializable {
      * 开启时间
      */
     @ApiModelProperty(value = "开启时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime endTime;
 
     /**
@@ -82,14 +83,14 @@ public class GoblinFrontBannerBuildParam implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime createTime;
 
     /**
      * 修改时间
      */
     @ApiModelProperty(value = "修改时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime updateTime;
 
     /**

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinFrontHotWordBuildParam.java

 package com.liquidnet.service.goblin.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -62,12 +64,14 @@ public class GoblinFrontHotWordBuildParam implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime createTime;
 
     /**
      * 修改时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updateTime;
 
     /**

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinFrontNavigationBuildParam.java

 package com.liquidnet.service.goblin.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,12 +82,14 @@ public class GoblinFrontNavigationBuildParam implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime createTime;
 
     /**
      * 修改时间
      */
     @ApiModelProperty(value = "修改时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updateTime;
 
     /**

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinFrontSeckillBuildParam.java

 package com.liquidnet.service.goblin.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -49,12 +53,14 @@ public class GoblinFrontSeckillBuildParam implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
     private LocalDateTime createTime;
 
     /**
      * 修改时间
      */
     @ApiModelProperty(value = "修改时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updateTime;
 
     /**
@@ -75,6 +81,18 @@ public class GoblinFrontSeckillBuildParam implements Serializable {
     @ApiModelProperty(value = "秒杀id")
     private String seckilId;
 
+    //活动
+    public List<Map> acityList;
+
+    private static final GoblinFrontSeckillBuildParam obj = new GoblinFrontSeckillBuildParam();
+
+    public static GoblinFrontSeckillBuildParam getNew() {
+        try {
+            return (GoblinFrontSeckillBuildParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinFrontSeckillBuildParam();
+        }
+    }
 
 
 }

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

@@ -138,11 +138,12 @@ public class GoblinFrontSeckillController extends BaseController {
     @PostMapping("page")
     @ApiOperation(value = "分页")
     @ResponseBody
-    public AjaxResult page( @RequestParam(name = "pageSize", required = true) int pageSize,@RequestParam(name = "pageNumber", required = true)int pageNumber,@RequestBody GoblinFrontSeckillBuildParam goblinFrontSeckillBuildParam) {
-        GoblinFrontSeckill goblinFrontSeckill=new GoblinFrontSeckill();
+    //@RequestParam(name = "pageSize", required = true) int pageSize,@RequestParam(name = "pageNumber", required = true)int pageNumber,@RequestBody GoblinFrontSeckillBuildParam goblinFrontSeckillBuildParam
+    public AjaxResult page( ) {
+        /*GoblinFrontSeckill goblinFrontSeckill=new GoblinFrontSeckill();
         BeanUtils.copyProperties(goblinFrontSeckillBuildParam,goblinFrontSeckill);
-        logger.info("限时秒杀分页{}", JSON.toJSONString(goblinFrontSeckill));
-        return AjaxResult.success(goblinFrontSeckillService.page(pageSize,pageNumber,null));
+        logger.info("限时秒杀分页{}", JSON.toJSONString(goblinFrontSeckill));*/
+        return AjaxResult.success(goblinFrontSeckillService.page());
     }
 
     /**

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

@@ -4,18 +4,20 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinFrontSeckillService;
 import com.liquidnet.common.cache.redis.util.RedisGoblinUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.entity.GoblinFrontSeckill;
+import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
+import com.liquidnet.service.goblin.entity.GoblinStoreMarketing;
 import com.liquidnet.service.goblin.mapper.GoblinFrontSeckillMapper;
 import com.liquidnet.service.goblin.mapper.GoblinSelfMarketingMapper;
 import com.liquidnet.service.goblin.mapper.GoblinStoreMarketingMapper;
+import com.liquidnet.service.goblin.param.GoblinFrontSeckillBuildParam;
 import com.mongodb.BasicDBObject;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -23,7 +25,11 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -87,18 +93,50 @@ public class GoblinFrontSeckillServiceImpl extends ServiceImpl<GoblinFrontSeckil
      * @Description:分页
      * @date 2021/12/27 下午5:19
      */
-    public PageInfo<GoblinFrontSeckill> page(int pageSize, int pageNumber, GoblinFrontSeckill goblinFrontSeckill) {
-        PageInfo<GoblinFrontSeckill> pageInfoTmp = null;
+    public GoblinFrontSeckillBuildParam page() {
         try {
-            PageHelper.startPage(pageNumber, pageSize);
             LambdaQueryWrapper<GoblinFrontSeckill> queryWrapper = Wrappers.lambdaQuery(GoblinFrontSeckill.class);
             queryWrapper.orderByDesc(GoblinFrontSeckill::getCreateTime);
             List<GoblinFrontSeckill> list=goblinFrontSeckillMapper.selectList(queryWrapper);
-            pageInfoTmp = new PageInfo(list);
+            GoblinFrontSeckillBuildParam goblinFrontSeckillBuildParam=GoblinFrontSeckillBuildParam.getNew();
+            List<Map> acityList= new ArrayList<>();
+            //遍历list 然后查找 官方 或者商铺
+            if(list.size()>0){
+                GoblinFrontSeckill goblinFrontSeckill1=list.get(0);
+                BeanUtils.copyProperties(goblinFrontSeckill1,goblinFrontSeckillBuildParam);
+                String selfActivityids =goblinFrontSeckill1.getSelfActivityids();
+                String[] actiyids=selfActivityids.split(",");
+                for(String aid:actiyids){
+                    String type=aid.split("_")[0];
+                    String id=aid.split("_")[1];
+                    if(type.equals("g")){
+                        //官方
+                        GoblinSelfMarketing goblinSelfMarketing=goblinSelfMarketingMapper.selectById(id);
+                        Map a=new HashMap();
+                        a.put("name",goblinSelfMarketing.getName());
+                        a.put("startTime",goblinSelfMarketing.getStartTime()==null?"":goblinSelfMarketing.getStartTime().format( DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        a.put("endTime",goblinSelfMarketing.getEndTime()==null?"":goblinSelfMarketing.getEndTime().format( DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        acityList.add(a);
+                        //封装
+                    }else if(type.equals("s")){
+                        //商铺
+                        GoblinStoreMarketing goblinStoreMarketing= goblinStoreMarketingMapper.selectById(id);
+                        Map a=new HashMap();
+                        a.put("name",goblinStoreMarketing.getName());
+                        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                        a.put("startTime",goblinStoreMarketing.getStartTime()==null?"":goblinStoreMarketing.getStartTime().format( DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        a.put("endTime",goblinStoreMarketing.getEndTime()==null?"":goblinStoreMarketing.getEndTime().format( DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        acityList.add(a);
+                    }
+                }
+                 goblinFrontSeckillBuildParam.setAcityList(acityList);
+                return goblinFrontSeckillBuildParam;
+            }
+            //pageInfoTmp = new PageInfo(Collections.singletonList(new ArrayList().add(goblinFrontSeckillBuildParam)));
         } catch (Exception e) {
-            return new PageInfo();
+            return  null;
         }
-        return pageInfoTmp;
+        return null;
     }
     /**
      * @author zhangfuxin

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

@@ -7,6 +7,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinFrontBannerVo;
 import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
 import com.liquidnet.service.goblin.entity.GoblinFrontHotWord;
 import com.liquidnet.service.goblin.entity.GoblinFrontNavigation;
+import com.liquidnet.service.goblin.entity.GoblinFrontSeckill;
 import com.liquidnet.service.goblin.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -80,5 +81,20 @@ public class GoblinFrontController {
         return ResponseDto.success( list );
     }
 
+    @GetMapping("getSeckilll")
+    @ApiOperation("获得秒杀首页要用的")
+    public ResponseDto getSeckilll() {
+        List<GoblinFrontSeckill> list= (List<GoblinFrontSeckill>) redisUtil.get(GoblinRedisConst.FRONT_SECKILL);
+        //判断是否有
+        if(null!=list&&list.size()>0){
+            //
+
+        }
+        return ResponseDto.success( list );
+    }
+
+
+
+
 
 }