合集修改、商品模糊搜索

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

@@ -66,5 +66,24 @@ public class GoblinFrontCompilationsParam implements Serializable {
     @ApiModelProperty(value = "0未删除1已删除")
     private Integer delTag;
 
+    /**
+     * 图片
+     */
+    @ApiModelProperty(value = "图片")
+    private String image;
+    /**
+     * 商品数量
+     */
+    @ApiModelProperty(value = "商品数量")
+    private int spuCount;
+    /***
+     * @author zhangfuxin
+     * @Description:描述
+     * @date 2022/1/7 下午2:59
+     */
+    @ApiModelProperty(value = "描述")
+    private  String describes;
+
+
 
 }

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

@@ -2,10 +2,15 @@ package com.liquidnet.client.admin.web.controller.zhengzai.goblin;
 
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.goblin.service.impl.GoblinFrontCompilationsServiceImpl;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.goblin.entity.GoblinFrontCompilations;
+import com.liquidnet.service.goblin.entity.GoblinGoods;
+import com.liquidnet.service.goblin.mapper.GoblinGoodsMapper;
 import com.liquidnet.service.goblin.param.GoblinFrontCompilationsParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +18,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 合集 前端控制器
@@ -28,7 +35,26 @@ public class GoblinFrontCompilationsController extends BaseController {
 
     @Autowired
     GoblinFrontCompilationsServiceImpl goblinFrontCompilationsService;
+    @Autowired
+    GoblinGoodsMapper goblinGoodsMapper;
 
+    /***
+     * @author zhangfuxin
+     * @Description:商品单品list
+     * @date 2022/1/7 下午2:39
+     */
+    @GetMapping("goodsList")
+    @ApiOperation(value = "商品单品list")
+    @ResponseBody
+    public AjaxResult goodsList(@RequestParam(name = "name", required = false) String name) {
+        LambdaQueryWrapper<GoblinGoods> queryWrapper = Wrappers.lambdaQuery(GoblinGoods.class);
+        queryWrapper.ne(GoblinGoods::getDelFlg,"1");
+        if(StringUtil.isNotBlank(name)){
+            queryWrapper.like(GoblinGoods::getName,name);
+        }
+        List<GoblinGoods> list= goblinGoodsMapper.selectList(queryWrapper);
+        return  AjaxResult.success(list);
+    }
     /**
      * @author zhangfuxin
      * @Description:添加合集
@@ -90,4 +116,11 @@ public class GoblinFrontCompilationsController extends BaseController {
     public AjaxResult page( @RequestParam(name = "pageSize", required = true) int pageSize,@RequestParam(name = "pageNumber", required = true)int pageNumber,@RequestBody GoblinFrontCompilationsParam goblinFrontCompilationsParam) {
         return AjaxResult.success(goblinFrontCompilationsService.page(pageSize,pageNumber));
     }
+
+    @PostMapping("list")
+    @ApiOperation(value = "合集模糊查询")
+    @ResponseBody
+    public AjaxResult list( @RequestParam(name = "name", required = false) String name) {
+        return AjaxResult.success(goblinFrontCompilationsService.getListGoblinFrontCompilations(name));
+    }
 }

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

@@ -10,10 +10,13 @@ import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinFrontCompilatio
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.entity.GoblinFrontCompilations;
 import com.liquidnet.service.goblin.mapper.GoblinFrontCompilationsMapper;
+import com.liquidnet.service.goblin.param.GoblinFrontCompilationsParam;
 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;
@@ -21,6 +24,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -40,6 +44,7 @@ public class GoblinFrontCompilationsServiceImpl extends ServiceImpl<GoblinFrontC
     @Autowired
     private RedisDataSourceUtil redisDataSourceUtil;
 
+
     public boolean create(GoblinFrontCompilations goblinFrontCompilations){
         goblinFrontCompilations.setCreateTime(LocalDateTime.now());
         //设置bannerid
@@ -56,20 +61,37 @@ public class GoblinFrontCompilationsServiceImpl extends ServiceImpl<GoblinFrontC
     public GoblinFrontCompilations getOne(Long id){
         return  goblinFrontCompilationsMapper.selectById(id);
     }
+
+    public List<GoblinFrontCompilations> getListGoblinFrontCompilations(String name){
+        LambdaQueryWrapper<GoblinFrontCompilations> queryWrapper = Wrappers.lambdaQuery(GoblinFrontCompilations.class);
+        queryWrapper.ne(GoblinFrontCompilations::getDelTag,"1");
+        if(StringUtil.isNotBlank(name)){
+            queryWrapper.like(GoblinFrontCompilations::getName,name);
+        }
+        List<GoblinFrontCompilations> list= goblinFrontCompilationsMapper.selectList(queryWrapper);
+        return list;
+    }
     public boolean delte(Long id){
         GoblinFrontCompilations goblinFrontCompilations=goblinFrontCompilationsMapper.selectById(id);
         goblinFrontCompilations.setDelTag(1);
         this.update(goblinFrontCompilations);
         return true;
     }
-    public PageInfo<GoblinFrontCompilations> page(int pageSize, int pageNumber) {
-        PageInfo<GoblinFrontCompilations> pageInfoTmp = null;
+    public PageInfo<GoblinFrontCompilationsParam> page(int pageSize, int pageNumber) {
+        PageInfo<GoblinFrontCompilationsParam> pageInfoTmp = null;
         try {
             PageHelper.startPage(pageNumber, pageSize);
             LambdaQueryWrapper<GoblinFrontCompilations> queryWrapper = Wrappers.lambdaQuery(GoblinFrontCompilations.class);
             queryWrapper.orderByDesc(GoblinFrontCompilations::getCreateTime);
             List<GoblinFrontCompilations> list=goblinFrontCompilationsMapper.selectList(queryWrapper);
-            pageInfoTmp = new PageInfo(list);
+            List<GoblinFrontCompilationsParam> list1=new ArrayList<>();
+            for(GoblinFrontCompilations goblinFrontCompilations:list){
+                GoblinFrontCompilationsParam goblinFrontCompilationsParam=new GoblinFrontCompilationsParam();
+                BeanUtils.copyProperties(goblinFrontCompilations,goblinFrontCompilationsParam);
+                list1.add(goblinFrontCompilationsParam);
+            }
+
+            pageInfoTmp = new PageInfo(list1);
         } catch (Exception e) {
             return new PageInfo();
         }

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

@@ -54,6 +54,20 @@ public class GoblinFrontCompilations implements Serializable {
      * 0未删除1已删除
      */
     private Integer delTag;
+    /**
+     * 图片
+     */
+    private String image;
+    /**
+     * 商品数量
+     */
+    private int spuCount;
+    /***
+     * @author zhangfuxin
+     * @Description:描述
+     * @date 2022/1/7 下午2:59
+     */
+    private  String describes;
 
 
 }