Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-webapp-plug into developer

src/main/java/com/gic/plug/web/controller/goods/GoodsController.java

@@ -4,23 +4,23 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.goods.api.dto.ErrorCode;
-import com.gic.goods.api.dto.GoodsTagDTO;
-import com.gic.goods.api.service.TagApiService;
-import com.gic.plug.web.vo.goods.GoodsTagVO;
+import com.gic.goods.api.dto.GoodsSkuDTO;
+import com.gic.goods.api.service.GoodsApiService;
+import com.gic.plug.web.vo.goods.GoodsVO;
 import com.gic.search.business.api.dto.DynamicSearchDTO;
 import com.gic.search.business.api.dto.ESResponseQueryBatchDTO;
-import com.gic.search.business.api.service.EsBusinessManageApiService;
 import com.gic.search.business.api.service.EsBusinessOperaApiService;
-import com.gic.search.business.api.utils.NewNodeAddUtil;
 import com.gic.widget.screening.api.service.EsScreeningSearchService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.curator.shaded.com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
   * @ClassName: GoodsTagController
@@ -37,14 +37,72 @@ public class GoodsController {
     @Autowired
     private EsScreeningSearchService esScreeningSearchService;
 
+    @Autowired
+    private GoodsApiService goodsApiService;
+
 
     /**
      * @Description: 查询所有（不分页）
      * @author xub
      */
     @GetMapping("list-goods")
-    public RestResponse findList(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
-                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String goodsCode) {
+    public RestResponse ListGoods(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
+                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search) {
+        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search);
+        if (serviceResponse.isSuccess()) {
+            return RestResponse.success(serviceResponse.getResult());
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
+
+    /**
+     * @Description: 查询所有（不分页）
+     * @author xub
+     */
+    @GetMapping("list-sku")
+    public RestResponse ListSku(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
+                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId,String search) {
+        ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = searchES(currentPage,pageSize,goodsDomainId,search);
+        if (!serviceResponse.isSuccess()) {
+            return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
+        //商品信息
+        List<JSONObject> list = serviceResponse.getResult().getRes();
+        if (CollectionUtils.isEmpty(list)) {
+            return RestResponse.success(serviceResponse.getResult());
+        }
+        //1、获取商品信息
+        List<GoodsVO> goodsVOS = Lists.newArrayList();
+        for (JSONObject jsonObject : list) {
+            GoodsVO goodsVO = JSONObject.toJavaObject(jsonObject, GoodsVO.class);
+            goodsVOS.add(goodsVO);
+        }
+       //2、获取商品ID信息
+        List<Long> goodsIds = goodsVOS.stream().mapToLong(GoodsVO::getGoodsId).boxed().collect(Collectors.toList());
+        ServiceResponse<List<GoodsSkuDTO>> skuResponse = goodsApiService.listSkuByGoods(goodsIds);
+        if (!skuResponse.isSuccess()) {
+            return RestResponse.failure(skuResponse.getCode(), skuResponse.getMessage());
+
+        }
+        //3、获取sku信息 同时存储在map中
+        List<GoodsSkuDTO> skuDTOList = skuResponse.getResult();
+        if (CollectionUtils.isEmpty(skuDTOList)) {
+            return RestResponse.success(serviceResponse.getResult());
+        }
+        Map<Long, List<GoodsSkuDTO>> goodsIdAndskuDto = skuDTOList.stream().collect(Collectors.groupingBy(GoodsSkuDTO::getGoodsId));
+        //4、商品信息中包含是sku信息
+        for (GoodsVO goodsVO : goodsVOS) {
+            if (goodsIdAndskuDto.containsKey(goodsVO.getGoodsId())) {
+                List<GoodsVO.SkuVO> skuVOList = EntityUtil.changeEntityListByOrika(GoodsVO.SkuVO.class,goodsIdAndskuDto.get(goodsVO.getGoodsId()));
+                goodsVO.setSkuVOList(skuVOList);
+            }
+        }
+        return RestResponse.success(goodsVOS);
+    }
+
+
+    private ServiceResponse<ESResponseQueryBatchDTO> searchES( Integer currentPage,Integer pageSize, Long goodsDomainId,String search) {
         DynamicSearchDTO searchDTO = new DynamicSearchDTO();
         String esName = esScreeningSearchService.getCurrentEsName("goods-test-123456", "goods-search");
         searchDTO.setIndexName(esName);
@@ -54,13 +112,10 @@ public class GoodsController {
         searchDTO.setBegin(currentPage);
         searchDTO.setRecordNumber(pageSize);
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("goodsCode", goodsCode);
+        jsonObject.put("goodsCode", search);
         jsonObject.put("goodsDomainId", goodsDomainId);
         searchDTO.setSearchJson(jsonObject);
         ServiceResponse<ESResponseQueryBatchDTO> serviceResponse = esBusinessOperaApiService.queryDataBatch(searchDTO, false, null);
-        if (serviceResponse.isSuccess()) {
-            return RestResponse.success(serviceResponse.getResult());
-        }
-        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        return serviceResponse;
     }
 }

src/main/java/com/gic/plug/web/controller/goods/GoodsRightsSelectorController.java

+package com.gic.plug.web.controller.goods;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
+import com.gic.goods.api.service.GoodsRightsSelectorApiService;
+import com.gic.plug.web.qo.goods.GoodsRightsSelectorSaveQO;
+import com.gic.plug.web.qo.goods.GoodsRightsSelectorUpdateQO;
+import com.gic.plug.web.vo.goods.GoodsRightsSelectorVO;
+
+@RestController
+public class GoodsRightsSelectorController {
+
+    @Autowired
+    private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
+
+    /**
+    * @Title: goodsRightsSelectorSave
+    * @Description: 保存商品选择器权限版
+    * @author majia
+     * @param goodsRightsSelectorSaveQO
+    * @return  com.gic.commons.webapi.reponse.RestResponse
+    * @throws
+    */
+    @RequestMapping("/goods-rights-selector-save")
+    public RestResponse goodsRightsSelectorSave(GoodsRightsSelectorSaveQO goodsRightsSelectorSaveQO) {
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsRightsSelectorDTO.class, goodsRightsSelectorSaveQO);
+        ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.saveGoodsRightsSelector(goodsRightsSelectorDTO);
+        if (serviceResponse.isSuccess()) {
+            goodsRightsSelectorDTO = serviceResponse.getResult();
+            return RestResponse.success(EntityUtil.changeEntityByOrika(GoodsRightsSelectorVO.class, goodsRightsSelectorDTO));
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
+    @RequestMapping("/goods-rights-selector-update")
+    public RestResponse goodsRightsSelectorSave(GoodsRightsSelectorUpdateQO goodsRightsSelectorUpdateQO) {
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsRightsSelectorDTO.class, goodsRightsSelectorUpdateQO);
+        ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.updateGoodsRightsSelector(goodsRightsSelectorDTO);
+        if (serviceResponse.isSuccess()) {
+            goodsRightsSelectorDTO = serviceResponse.getResult();
+            return RestResponse.success(EntityUtil.changeEntityByOrika(GoodsRightsSelectorVO.class, goodsRightsSelectorDTO));
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
+    @RequestMapping("/get-goods-rights-selector")
+    public RestResponse getGoodsRightsSelector(Long goodsRightsSelectorId) {
+        ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(goodsRightsSelectorId);
+        if (serviceResponse.isSuccess()) {
+            GoodsRightsSelectorDTO goodsRightsSelectorDTO = serviceResponse.getResult();
+            return RestResponse.success(EntityUtil.changeEntityByOrika(GoodsRightsSelectorVO.class, goodsRightsSelectorDTO));
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
+}

src/main/java/com/gic/plug/web/controller/goods/GoodsSelectorController.java

+package com.gic.plug.web.controller.goods;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.goods.api.dto.GoodsSelectorDTO;
+import com.gic.goods.api.service.GoodsRightsSelectorApiService;
+import com.gic.goods.api.service.GoodsSelectorApiService;
+import com.gic.goods.api.util.Constant;
+import com.gic.plug.web.qo.goods.GoodsSelectorSaveQO;
+import com.gic.plug.web.qo.goods.GoodsSelectorUpdateQO;
+import com.gic.plug.web.vo.goods.GoodsSelectorVO;
+
+@RestController
+public class GoodsSelectorController {
+
+    @Autowired
+    private GoodsSelectorApiService goodsSelectorApiService;
+
+    @Autowired
+    private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
+
+    @RequestMapping("goods-selector-show-back")
+    public RestResponse goodsSelectorShowBack(Long goodsSelectorId) {
+        ServiceResponse<GoodsSelectorDTO> serviceResponse = goodsSelectorApiService.getGoodsSelector(goodsSelectorId);
+        if (serviceResponse.isSuccess()) {
+            return RestResponse.success(serviceResponse.getResult().getGoodsSearchValue());
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
+
+    @RequestMapping("goods-selector-edit-show-back")
+    public RestResponse goodsSelectorEditShowBack(Long goodsSelectorId) {
+        ServiceResponse<GoodsSelectorDTO> serviceResponse = goodsSelectorApiService.getGoodsSelector(goodsSelectorId);
+        if (serviceResponse.isSuccess()) {
+            return RestResponse.success(serviceResponse.getResult().getGoodsSearchEdit());
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
+    @RequestMapping("goods-selector-save")
+    public RestResponse goodsSelectorSave(GoodsSelectorSaveQO goodsSelectorSaveQO) {
+        GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorSaveQO);
+        goodsSelectorDTO.setEnterpriseId(Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsSelectorDTO> serviceResponse = goodsSelectorApiService.saveGoodsSelector(goodsSelectorDTO);
+        if (serviceResponse.isSuccess()) {
+            goodsSelectorDTO = serviceResponse.getResult();
+            GoodsSelectorVO goodsSelectorVO = EntityUtil.changeEntityByOrika(GoodsSelectorVO.class, goodsSelectorDTO);
+            return RestResponse.success(goodsSelectorVO);
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
+
+    @RequestMapping("change-goods-rights-for-selector")
+    public RestResponse changeGoodsRightsForSelector(Long goodsSelectorId) {
+        goodsRightsSelectorApiService.getGoodsRightsSelector(1234L);
+        return null;
+    }
+
+
+
+    @RequestMapping("goods-selector-update")
+    public RestResponse goodsSelectorUpdate(GoodsSelectorUpdateQO goodsSelectorUpdateQO) {
+        GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorUpdateQO);
+        ServiceResponse<GoodsSelectorDTO> serviceResponse = goodsSelectorApiService.updateGoodsSelector(goodsSelectorDTO);
+        if (serviceResponse.isSuccess()) {
+            goodsSelectorDTO = serviceResponse.getResult();
+            GoodsSelectorVO goodsSelectorVO = EntityUtil.changeEntityByOrika(GoodsSelectorVO.class, goodsSelectorDTO);
+            return RestResponse.success(goodsSelectorVO);
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+}

src/main/java/com/gic/plug/web/controller/goods/GoodsTagController.java

 package com.gic.plug.web.controller.goods;
 
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.goods.api.dto.ErrorCode;
 import com.gic.goods.api.dto.GoodsTagDTO;
+import com.gic.goods.api.dto.StandardDTO;
 import com.gic.goods.api.service.TagApiService;
 import com.gic.plug.web.vo.goods.GoodsTagVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -31,16 +35,16 @@ public class GoodsTagController {
      * @author xub
      */
     @GetMapping("list-tag")
-    public RestResponse findList(Long goodsDomainId) {
+    public RestResponse findList(@RequestParam(value = "currentPage", defaultValue = "1") Integer currentPage,
+                                 @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, Long goodsDomainId) {
         if (goodsDomainId == null) {
             return RestResponse.failure(ErrorCode.UNKNOW_ERROR.getCode(), "参数不全");
         }
-        ServiceResponse<List<GoodsTagDTO>> serviceResponse = tagApiService.listAll(goodsDomainId);
-        List<GoodsTagDTO> result = serviceResponse.getResult();
-        if (CollectionUtils.isEmpty(result)) {
-            return RestResponse.success();
-        }
-        List<GoodsTagVO> list = EntityUtil.changeEntityListByOrika(GoodsTagVO.class, result);
-        return RestResponse.success(list);
+
+        ServiceResponse<Page<GoodsTagDTO>> serviceResponse = tagApiService.listByPage(currentPage, pageSize,
+                goodsDomainId);
+        Page<GoodsTagVO> voPage = PageHelperUtils.changePageToCurrentPage(serviceResponse.getResult(),
+                GoodsTagVO.class);
+        return RestResponse.success(voPage);
     }
 }

src/main/java/com/gic/plug/web/qo/goods/GoodsRightsSelectorSaveQO.java

+package com.gic.plug.web.qo.goods;
+
+public class GoodsRightsSelectorSaveQO {
+
+    /**
+     * 搜索时使用的值
+     */
+    private String goodsRightsSearchValue;
+
+
+    /**
+     * 编辑回显的值
+     */
+    private String goodsRightSearchEdit;
+
+    public String getGoodsRightsSearchValue() {
+        return goodsRightsSearchValue;
+    }
+
+    public void setGoodsRightsSearchValue(String goodsRightsSearchValue) {
+        this.goodsRightsSearchValue = goodsRightsSearchValue;
+    }
+
+    public String getGoodsRightSearchEdit() {
+        return goodsRightSearchEdit;
+    }
+
+    public void setGoodsRightSearchEdit(String goodsRightSearchEdit) {
+        this.goodsRightSearchEdit = goodsRightSearchEdit;
+    }
+}

src/main/java/com/gic/plug/web/qo/goods/GoodsRightsSelectorUpdateQO.java

+package com.gic.plug.web.qo.goods;
+
+public class GoodsRightsSelectorUpdateQO {
+
+    /**
+     *
+     */
+    private Long goodsRightsSelectorId;
+
+
+    /**
+     * 搜索时使用的值
+     */
+    private String goodsRightsSearchValue;
+
+
+    /**
+     * 编辑回显的值
+     */
+    private String goodsRightSearchEdit;
+
+    public Long getGoodsRightsSelectorId() {
+        return goodsRightsSelectorId;
+    }
+
+    public void setGoodsRightsSelectorId(Long goodsRightsSelectorId) {
+        this.goodsRightsSelectorId = goodsRightsSelectorId;
+    }
+
+    public String getGoodsRightsSearchValue() {
+        return goodsRightsSearchValue;
+    }
+
+    public void setGoodsRightsSearchValue(String goodsRightsSearchValue) {
+        this.goodsRightsSearchValue = goodsRightsSearchValue;
+    }
+
+    public String getGoodsRightSearchEdit() {
+        return goodsRightSearchEdit;
+    }
+
+    public void setGoodsRightSearchEdit(String goodsRightSearchEdit) {
+        this.goodsRightSearchEdit = goodsRightSearchEdit;
+    }
+}

src/main/java/com/gic/plug/web/qo/goods/GoodsSelectorSaveQO.java

+package com.gic.plug.web.qo.goods;
+
+public class GoodsSelectorSaveQO {
+
+    private String goodsSearchValue;
+
+    private String goodsSearchEdit;
+
+    /**
+     * 使用业务
+     */
+    private String useType;
+
+    /**
+     * 搜索类型
+     * 1 skuCode
+     * 2 skuId
+     */
+    private Integer searchResultType;
+
+    public String getGoodsSearchValue() {
+        return goodsSearchValue;
+    }
+
+    public void setGoodsSearchValue(String goodsSearchValue) {
+        this.goodsSearchValue = goodsSearchValue;
+    }
+
+    public String getGoodsSearchEdit() {
+        return goodsSearchEdit;
+    }
+
+    public void setGoodsSearchEdit(String goodsSearchEdit) {
+        this.goodsSearchEdit = goodsSearchEdit;
+    }
+
+    public String getUseType() {
+        return useType;
+    }
+
+    public void setUseType(String useType) {
+        this.useType = useType;
+    }
+
+    public Integer getSearchResultType() {
+        return searchResultType;
+    }
+
+    public void setSearchResultType(Integer searchResultType) {
+        this.searchResultType = searchResultType;
+    }
+}

src/main/java/com/gic/plug/web/qo/goods/GoodsSelectorUpdateQO.java

+package com.gic.plug.web.qo.goods;
+
+public class GoodsSelectorUpdateQO {
+
+    private Long goodsSelectorId;
+
+    private String goodsSearchValue;
+
+    private String goodsSearchEdit;
+
+    /**
+     * 搜索类型
+     * 1 skuCode
+     * 2 skuId
+     */
+    private Integer searchResultType;
+
+    public Long getGoodsSelectorId() {
+        return goodsSelectorId;
+    }
+
+    public void setGoodsSelectorId(Long goodsSelectorId) {
+        this.goodsSelectorId = goodsSelectorId;
+    }
+
+    public String getGoodsSearchValue() {
+        return goodsSearchValue;
+    }
+
+    public void setGoodsSearchValue(String goodsSearchValue) {
+        this.goodsSearchValue = goodsSearchValue;
+    }
+
+    public String getGoodsSearchEdit() {
+        return goodsSearchEdit;
+    }
+
+    public void setGoodsSearchEdit(String goodsSearchEdit) {
+        this.goodsSearchEdit = goodsSearchEdit;
+    }
+
+    public Integer getSearchResultType() {
+        return searchResultType;
+    }
+
+    public void setSearchResultType(Integer searchResultType) {
+        this.searchResultType = searchResultType;
+    }
+}

src/main/java/com/gic/plug/web/vo/goods/CategoryVO.java

@@ -82,6 +82,11 @@ public class CategoryVO implements Serializable {
      */
     private Boolean isSelected;
 
+    /**
+     *  ture代表有没有子类 false代表有
+     */
+    private Boolean nextChild;
+
     public Long getSpecCategoryId() {
         return specCategoryId;
     }
@@ -193,4 +198,13 @@ public class CategoryVO implements Serializable {
     public void setSelected(Boolean selected) {
         isSelected = selected;
     }
+
+
+    public Boolean getNextChild() {
+        return nextChild;
+    }
+
+    public void setNextChild(Boolean nextChild) {
+        this.nextChild = nextChild;
+    }
 }

src/main/java/com/gic/plug/web/vo/goods/GoodsRightsSelectorVO.java

+package com.gic.plug.web.vo.goods;
+
+import java.util.Date;
+
+public class GoodsRightsSelectorVO {
+    /**
+     *
+     */
+    private Long goodsRightsSelectorId;
+
+    /**
+     * 企业id
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 是否删除
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 搜索时使用的值
+     */
+    private String goodsRightsSearchValue;
+
+    /**
+     * 默认状态回显的值
+     */
+    private String goodsRightsSearchText;
+
+    /**
+     * 编辑回显的值
+     */
+    private String goodsRightSearchEdit;
+
+    /**
+     * 权限内的domainid{"channelCode":[domainId1,domainId2]}
+     */
+    private String goodsRightsDomains;
+
+    /**
+     * 权限内的brandId{"channelCode_domainId":[brandId1,brandId2]}
+     */
+    private String goodsRightsBrands;
+
+    public Long getGoodsRightsSelectorId() {
+        return goodsRightsSelectorId;
+    }
+
+    public void setGoodsRightsSelectorId(Long goodsRightsSelectorId) {
+        this.goodsRightsSelectorId = goodsRightsSelectorId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getGoodsRightsSearchValue() {
+        return goodsRightsSearchValue;
+    }
+
+    public void setGoodsRightsSearchValue(String goodsRightsSearchValue) {
+        this.goodsRightsSearchValue = goodsRightsSearchValue;
+    }
+
+    public String getGoodsRightsSearchText() {
+        return goodsRightsSearchText;
+    }
+
+    public void setGoodsRightsSearchText(String goodsRightsSearchText) {
+        this.goodsRightsSearchText = goodsRightsSearchText;
+    }
+
+    public String getGoodsRightSearchEdit() {
+        return goodsRightSearchEdit;
+    }
+
+    public void setGoodsRightSearchEdit(String goodsRightSearchEdit) {
+        this.goodsRightSearchEdit = goodsRightSearchEdit;
+    }
+
+    public String getGoodsRightsDomains() {
+        return goodsRightsDomains;
+    }
+
+    public void setGoodsRightsDomains(String goodsRightsDomains) {
+        this.goodsRightsDomains = goodsRightsDomains;
+    }
+
+    public String getGoodsRightsBrands() {
+        return goodsRightsBrands;
+    }
+
+    public void setGoodsRightsBrands(String goodsRightsBrands) {
+        this.goodsRightsBrands = goodsRightsBrands;
+    }
+}

src/main/java/com/gic/plug/web/vo/goods/GoodsSelectorVO.java

+package com.gic.plug.web.vo.goods;
+
+public class GoodsSelectorVO {
+
+
+    private Long goodsSelectorId;
+
+    private String goodsSearchValue;
+
+    private String goodsSearchText;
+
+    private String goodsSearchEdit;
+
+    private String goodsSearchRightValue;
+
+    private String goodsSearchRightText;
+
+    private Integer enterpriseId;
+
+    /**
+     * 使用业务
+     */
+    private String useType;
+
+    /**
+     * 搜索类型
+     * 1 skuCode
+     * 2 skuId
+     */
+    private Integer searchResultType;
+
+    private Long findCount;
+
+
+    public Long getGoodsSelectorId() {
+        return goodsSelectorId;
+    }
+
+    public void setGoodsSelectorId(Long goodsSelectorId) {
+        this.goodsSelectorId = goodsSelectorId;
+    }
+
+    public String getGoodsSearchValue() {
+        return goodsSearchValue;
+    }
+
+    public void setGoodsSearchValue(String goodsSearchValue) {
+        this.goodsSearchValue = goodsSearchValue;
+    }
+
+    public String getGoodsSearchText() {
+        return goodsSearchText;
+    }
+
+    public void setGoodsSearchText(String goodsSearchText) {
+        this.goodsSearchText = goodsSearchText;
+    }
+
+    public String getGoodsSearchEdit() {
+        return goodsSearchEdit;
+    }
+
+    public void setGoodsSearchEdit(String goodsSearchEdit) {
+        this.goodsSearchEdit = goodsSearchEdit;
+    }
+
+    public String getGoodsSearchRightValue() {
+        return goodsSearchRightValue;
+    }
+
+    public void setGoodsSearchRightValue(String goodsSearchRightValue) {
+        this.goodsSearchRightValue = goodsSearchRightValue;
+    }
+
+    public String getGoodsSearchRightText() {
+        return goodsSearchRightText;
+    }
+
+    public void setGoodsSearchRightText(String goodsSearchRightText) {
+        this.goodsSearchRightText = goodsSearchRightText;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getUseType() {
+        return useType;
+    }
+
+    public void setUseType(String useType) {
+        this.useType = useType;
+    }
+
+    public Integer getSearchResultType() {
+        return searchResultType;
+    }
+
+    public void setSearchResultType(Integer searchResultType) {
+        this.searchResultType = searchResultType;
+    }
+
+    public Long getFindCount() {
+        return findCount;
+    }
+
+    public void setFindCount(Long findCount) {
+        this.findCount = findCount;
+    }
+}

src/main/java/com/gic/plug/web/vo/goods/GoodsVO.java

+package com.gic.plug.web.vo.goods;
+
+import java.util.List;
+
+/**
+ * @author xub
+ * @ClassName: GoodsSkuDTO
+ * @Description: sku部分商品查询
+ * @date 2019/9/16 下午2:01
+ */
+public class GoodsVO {
+
+
+    /**
+     * 商品ID
+     */
+    private Long goodsId;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 域ID
+     */
+    private Long goodsDomainId;
+    /**
+     * 货号
+     */
+    private String goodsCode;
+
+    /**
+     * SKU  信息
+     */
+    private List<SkuVO>  skuVOList;
+
+
+    public Long getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(Long goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public Long getGoodsDomainId() {
+        return goodsDomainId;
+    }
+
+    public void setGoodsDomainId(Long goodsDomainId) {
+        this.goodsDomainId = goodsDomainId;
+    }
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode;
+    }
+
+    public List<SkuVO> getSkuVOList() {
+        return skuVOList;
+    }
+
+    public void setSkuVOList(List<SkuVO> skuVOList) {
+        this.skuVOList = skuVOList;
+    }
+
+    public static class SkuVO {
+        /**
+         * ID
+         */
+        private Long goodsSkuId;
+        /**
+         * sku数据
+         */
+        private String goodsSkuInfo;
+        /**
+         * code
+         */
+        private String goodsSkuCode;
+
+        public Long getGoodsSkuId() {
+            return goodsSkuId;
+        }
+
+        public void setGoodsSkuId(Long goodsSkuId) {
+            this.goodsSkuId = goodsSkuId;
+        }
+
+        public String getGoodsSkuInfo() {
+            return goodsSkuInfo;
+        }
+
+        public void setGoodsSkuInfo(String goodsSkuInfo) {
+            this.goodsSkuInfo = goodsSkuInfo;
+        }
+
+        public String getGoodsSkuCode() {
+            return goodsSkuCode;
+        }
+
+        public void setGoodsSkuCode(String goodsSkuCode) {
+            this.goodsSkuCode = goodsSkuCode;
+        }
+    }
+
+}
\ No newline at end of file

src/main/resources/dubbo-gic-webapp-plug.xml

@@ -41,9 +41,12 @@
     <dubbo:reference interface="com.gic.goods.api.service.PropertyValueApiService" id="propertyValueApiService" timeout="60000" retries="0" />
     <dubbo:reference interface="com.gic.goods.api.service.PropertyApiService" id="propertyApiService" timeout="60000" retries="0" />
     <dubbo:reference interface="com.gic.goods.api.service.BrandApiService" id="brandApiService" timeout="60000" retries="0" />
+    <dubbo:reference interface="com.gic.goods.api.service.GoodsSelectorApiService" id="goodsSelectorApiService" timeout="60000" retries="0" />
+    <dubbo:reference interface="com.gic.goods.api.service.GoodsRightsSelectorApiService" id="goodsRightsSelectorApiService" timeout="60000" retries="0" />
     <!--  -->
-    <dubbo:reference id="tagApiService" interface="com.gic.goods.api.service.TagApiService" timeout="60000" retries="0" check="false"/>
+    <dubbo:reference id="tagApiService" interface="com.gic.goods.api.service.TagApiService" timeout="60000" retries="0" check="false" />
     <dubbo:reference id="cordApiService" interface="com.gic.goods.api.service.CordApiService" timeout="60000" retries="0" check="false"/>
+    <dubbo:reference id="goodsApiService" interface="com.gic.goods.api.service.GoodsApiService" timeout="60000" retries="0" check="false"/>
 
     <dubbo:reference interface="com.gic.search.business.api.service.EsBusinessOperaApiService" id="esBusinessOperaApiService" timeout="60000" retries="0" />