记得上下班打卡 | git大法好,push需谨慎

Commit 1eb42693 authored by zhengfuxin's avatar zhengfuxin

秒杀 修改

parent f704455d
...@@ -18,7 +18,6 @@ import io.swagger.annotations.ApiOperation; ...@@ -18,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
...@@ -57,10 +56,14 @@ public class GoblinFrontSeckillController extends BaseController { ...@@ -57,10 +56,14 @@ public class GoblinFrontSeckillController extends BaseController {
LambdaQueryWrapper<GoblinSelfMarketing> queryWrapperM = Wrappers.lambdaQuery(GoblinSelfMarketing.class); LambdaQueryWrapper<GoblinSelfMarketing> queryWrapperM = Wrappers.lambdaQuery(GoblinSelfMarketing.class);
queryWrapperM.ne(GoblinSelfMarketing::getStatus,7); queryWrapperM.ne(GoblinSelfMarketing::getStatus,7);
List<GoblinSelfMarketing> listGoblinSelfMarketing=goblinSelfMarketingMapper.selectList(queryWrapperM); 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("listStoreMarketing",listStoreMarketing);
list.put("listGoblinSelfMarketing",listGoblinSelfMarketing); list.put("listGoblinSelfMarketing",listGoblinSelfMarketing);*/
return AjaxResult.success(list); return AjaxResult.success(list);
} }
......
...@@ -2,7 +2,6 @@ package com.liquidnet.client.admin.zhengzai.goblin.service.impl; ...@@ -2,7 +2,6 @@ package com.liquidnet.client.admin.zhengzai.goblin.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
...@@ -65,12 +64,12 @@ public class GoblinFrontSeckillServiceImpl extends ServiceImpl<GoblinFrontSeckil ...@@ -65,12 +64,12 @@ public class GoblinFrontSeckillServiceImpl extends ServiceImpl<GoblinFrontSeckil
goblinFrontSeckill.setUpdateTime(LocalDateTime.now()); goblinFrontSeckill.setUpdateTime(LocalDateTime.now());
//数据库修改 //数据库修改
goblinFrontSeckillMapper.updateById(goblinFrontSeckill); goblinFrontSeckillMapper.updateById(goblinFrontSeckill);
//修改所有的展示形式 /* //修改所有的展示形式
UpdateWrapper updateWrapper = new UpdateWrapper(); UpdateWrapper updateWrapper = new UpdateWrapper();
updateWrapper.set("activityType", goblinFrontSeckill.getActivityType()); updateWrapper.set("activityType", goblinFrontSeckill.getActivityType());
updateWrapper.set("show_type", goblinFrontSeckill.getShowType()); updateWrapper.set("show_type", goblinFrontSeckill.getShowType());
goblinFrontSeckillMapper.update(null,updateWrapper); goblinFrontSeckillMapper.update(null,updateWrapper);*/
return true; return true;
} }
public GoblinFrontSeckill getOne(Long id){ public GoblinFrontSeckill getOne(Long id){
......
...@@ -15,7 +15,7 @@ import java.time.LocalDateTime; ...@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* </p> * </p>
* *
* @author liquidnet * @author liquidnet
* @since 2021-12-29 * @since 2021-12-30
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
...@@ -30,10 +30,10 @@ public class GoblinFrontSeckill implements Serializable { ...@@ -30,10 +30,10 @@ public class GoblinFrontSeckill implements Serializable {
private Long mid; private Long mid;
/** /**
* 活动id * 官方活动id
*/ */
@TableField("activityId") @TableField("self_activityIds")
private Long activityId; private String selfActivityids;
/** /**
* 1、一行三个2、两行三个 * 1、一行三个2、两行三个
...@@ -65,13 +65,12 @@ public class GoblinFrontSeckill implements Serializable { ...@@ -65,13 +65,12 @@ public class GoblinFrontSeckill implements Serializable {
* 排序 * 排序
*/ */
private Integer indexs; private Integer indexs;
/** /**
* 秒杀id * 秒杀id
*/ */
private String seckilId; private String seckilId;
/**
* 1、官方营销表2、商铺营销表
*/
private int marketType;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment