秒杀 修改

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

@@ -18,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -57,10 +56,14 @@ public class GoblinFrontSeckillController extends BaseController {
         LambdaQueryWrapper<GoblinSelfMarketing> queryWrapperM = Wrappers.lambdaQuery(GoblinSelfMarketing.class);
         queryWrapperM.ne(GoblinSelfMarketing::getStatus,7);
         List<GoblinSelfMarketing> listGoblinSelfMarketing=goblinSelfMarketingMapper.selectList(queryWrapperM);
+        List<Object> list=CollectionUtil.arrayListObject();
+        list.addAll(listStoreMarketing);
+        list.addAll(listGoblinSelfMarketing);
         //整合
-        HashMap<String, Object> list= CollectionUtil.mapStringObject();
+       /* HashMap<String, Object> list= CollectionUtil.mapStringObject();
+
         list.put("listStoreMarketing",listStoreMarketing);
-        list.put("listGoblinSelfMarketing",listGoblinSelfMarketing);
+        list.put("listGoblinSelfMarketing",listGoblinSelfMarketing);*/
         return  AjaxResult.success(list);
     }
 

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

@@ -2,7 +2,6 @@ package com.liquidnet.client.admin.zhengzai.goblin.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -65,12 +64,12 @@ public class GoblinFrontSeckillServiceImpl extends ServiceImpl<GoblinFrontSeckil
         goblinFrontSeckill.setUpdateTime(LocalDateTime.now());
         //数据库修改
         goblinFrontSeckillMapper.updateById(goblinFrontSeckill);
-        //修改所有的展示形式
+      /*  //修改所有的展示形式
         UpdateWrapper updateWrapper = new UpdateWrapper();
         updateWrapper.set("activityType", goblinFrontSeckill.getActivityType());
         updateWrapper.set("show_type", goblinFrontSeckill.getShowType());
 
-        goblinFrontSeckillMapper.update(null,updateWrapper);
+        goblinFrontSeckillMapper.update(null,updateWrapper);*/
         return true;
     }
     public GoblinFrontSeckill getOne(Long id){

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinFrontSeckill.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * </p>
  *
  * @author liquidnet
- * @since 2021-12-29
+ * @since 2021-12-30
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -30,10 +30,10 @@ public class GoblinFrontSeckill implements Serializable {
     private Long mid;
 
     /**
-     * 活动id
+     * 官方活动id
      */
-    @TableField("activityId")
-    private Long activityId;
+    @TableField("self_activityIds")
+    private String selfActivityids;
 
     /**
      * 1、一行三个2、两行三个
@@ -65,13 +65,12 @@ public class GoblinFrontSeckill implements Serializable {
      * 排序
      */
     private Integer indexs;
+
     /**
      * 秒杀id
      */
     private String seckilId;
-    /**
-     * 1、官方营销表2、商铺营销表
-     */
-    private int marketType;
+
+
 
 }