Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/GoblinStoreSearchDto.java

+package com.liquidnet.service.goblin.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreSearchDto", description = "店铺搜素")
+@Data
+public class GoblinStoreSearchDto implements Serializable, Cloneable {
+    private static final long serialVersionUID = 8425727558228094904L;
+    @ApiModelProperty(position = 11, value = "店铺id")
+    private String storeId;
+    @ApiModelProperty(position = 11, value = "店铺名称")
+    private String storeName;
+    @ApiModelProperty(position = 11, value = "店铺状态[0-填写资料中|1-店铺审核中|2-审核不通过|3-审核通过|4-停业|5-营业]")
+    private String status;
+
+    private static final GoblinStoreSearchDto obj = new GoblinStoreSearchDto();
+    public static GoblinStoreSearchDto getNew() {
+        try {
+            return (GoblinStoreSearchDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreSearchDto();
+        }
+    }
+}

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

+package com.liquidnet.client.admin.web.controller.zhengzai.goblin;
+
+import com.liquidnet.client.admin.common.annotation.Log;
+import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.enums.BusinessType;
+import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinCommonService;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.GoblinStoreSearchDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "商铺公共方法")
+@Controller
+@RequestMapping("goblin/common")
+public class GoblinCommonController extends BaseController {
+
+    @Autowired
+    IGoblinCommonService goblinCommonService;
+
+    @Log(title = "获取店铺列表", businessType = BusinessType.LIST)
+    @GetMapping("store")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "店铺名称[模糊]"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "List<String>", name = "status", value = "状态数组]"),
+    })
+    @ResponseBody
+    public ResponseDto<List<GoblinStoreSearchDto>> storeSearch(String name, List<String> status) {
+        return ResponseDto.success(goblinCommonService.storeSearch(name, status));
+    }
+
+    /** ------------------------------------------------------------------------ **/
+}

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

+package com.liquidnet.client.admin.zhengzai.goblin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.GoblinStoreSearchDto;
+import com.liquidnet.service.goblin.dto.manage.GoblinInsertZhengzaiParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinMarketSpuListVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinSelfZhengzaiSkuVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiStoreListVo;
+import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
+
+import java.util.List;
+
+/**
+ * 正在下单相关
+ */
+public interface IGoblinCommonService {
+
+   List<GoblinStoreSearchDto> storeSearch(String name,List<String> status);
+
+
+}

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

+package com.liquidnet.client.admin.zhengzai.goblin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinCommonService;
+import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinStoreInfoService;
+import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.service.goblin.dto.GoblinStoreSearchDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
+import com.liquidnet.service.goblin.entity.GoblinStoreInfo;
+import com.liquidnet.service.goblin.mapper.GoblinStoreInfoMapper;
+import com.mongodb.client.result.UpdateResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 店铺基础信息 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@Slf4j
+@Service
+public class GoblinCommonServiceImpl implements IGoblinCommonService {
+
+    @Autowired
+    GoblinStoreInfoMapper goblinStoreInfoMapper;
+
+    @Override
+    public List<GoblinStoreSearchDto> storeSearch(String name, List<String> status) {
+        List<GoblinStoreInfo> list = goblinStoreInfoMapper.selectList(Wrappers.lambdaQuery(GoblinStoreInfo.class)
+                .like(GoblinStoreInfo::getStoreName, name)
+                .in(GoblinStoreInfo::getStatus, status)
+                .select(GoblinStoreInfo::getStoreId, GoblinStoreInfo::getStoreName, GoblinStoreInfo::getStatus));
+        List<GoblinStoreSearchDto> dtoList = new ArrayList<>();
+        for (GoblinStoreInfo item:list) {
+            GoblinStoreSearchDto dto = GoblinStoreSearchDto.getNew();
+            dto.setStatus(item.getStatus());
+            dto.setStoreId(item.getStoreId());
+            dto.setStoreName(item.getStoreName());
+            dtoList.add(dto);
+        }
+        return dtoList;
+    }
+}