新增接口

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

 package com.gic.plug.web.controller.goods;
 
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.goods.api.dto.CategoryDTO;
+import com.gic.plug.web.vo.goods.CategoryVO;
+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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.goods.api.service.CategoryApiService;
 
+import java.util.List;
+
 @RestController
 public class GoodsCategoryController {
 
     @Autowired
-    private CategoryApiService categoryApiService;
+    private CategoryApiService categoryApiSerivce;
 
-    @RequestMapping("get-category-list-by-parent")
-    public RestResponse getCategoryListByParent() {
+    /**
+     * @Description: 查询所有（一级分组）
+     * @author xub
+     */
+    @GetMapping("list-parent-category")
+    public RestResponse listParentCord(Long goodsDomainId) {
+        ServiceResponse<List<CategoryDTO>> serviceResponse = categoryApiSerivce.listParentAll(goodsDomainId);
+        List<CategoryDTO> result = serviceResponse.getResult();
+        if (CollectionUtils.isEmpty(result)) {
+            return RestResponse.success();
+        }
+        List<CategoryVO> list = EntityUtil.changeEntityListByOrika(CategoryVO.class, result);
+        return RestResponse.success(list);
+    }
 
-        return null;
+    /**
+     * @Description: 查询所有（二级分组）
+     * @author xub
+     */
+    @GetMapping("list-child-category")
+    public RestResponse listChildAll(Long specParentId) {
+        ServiceResponse<List<CategoryDTO>> serviceResponse = categoryApiSerivce.listChildAll(specParentId);
+        List<CategoryDTO> result = serviceResponse.getResult();
+        if (CollectionUtils.isEmpty(result)) {
+            return RestResponse.success();
+        }
+        List<CategoryVO> list = EntityUtil.changeEntityListByOrika(CategoryVO.class, result);
+        return RestResponse.success(list);
     }
 
 }

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

+package com.gic.plug.web.controller.goods;
+
+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.GoodsCordDTO;
+import com.gic.goods.api.service.CordApiService;
+import com.gic.plug.web.vo.goods.GoodsCordVO;
+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.RestController;
+
+import java.util.List;
+
+/**
+  * @ClassName: GoodsTagController
+  * @Description: 商品标签相关接口
+  * @author xub
+  * @date 2019/8/29 上午10:03
+  */
+@RestController
+public class GoodsCordController {
+
+    @Autowired
+    private CordApiService cordApiService;
+
+    /**
+     * @Description: 查询所有（一级分组）
+     * @author xub
+     */
+    @GetMapping("list-parent-cord")
+    public RestResponse listParentCord(Long goodsDomainId) {
+        ServiceResponse<List<GoodsCordDTO>> serviceResponse = cordApiService.listParentAll(goodsDomainId);
+        List<GoodsCordDTO> result = serviceResponse.getResult();
+        if (CollectionUtils.isEmpty(result)) {
+            return RestResponse.success();
+        }
+        List<GoodsCordVO> list = EntityUtil.changeEntityListByOrika(GoodsCordVO.class, result);
+        return RestResponse.success(list);
+    }
+
+    /**
+     * @Description: 查询所有（二级分组）
+     * @author xub
+     */
+    @GetMapping("list-child-cord")
+    public RestResponse listChildAll(Long specParentId) {
+        ServiceResponse<List<GoodsCordDTO>> serviceResponse = cordApiService.listChildAll(specParentId);
+        List<GoodsCordDTO> result = serviceResponse.getResult();
+        if (CollectionUtils.isEmpty(result)) {
+            return RestResponse.success();
+        }
+        List<GoodsCordVO> list = EntityUtil.changeEntityListByOrika(GoodsCordVO.class, result);
+        return RestResponse.success(list);
+    }
+}

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

+package com.gic.plug.web.controller.goods;
+
+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 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.RestController;
+
+import java.util.List;
+
+/**
+  * @ClassName: GoodsTagController
+  * @Description: 商品标签相关接口
+  * @author xub
+  * @date 2019/8/29 上午10:03
+  */
+@RestController
+public class GoodsTagController {
+
+    @Autowired
+    private TagApiService tagApiService;
+
+    /**
+     * @Description: 查询所有（不分页）
+     * @author xub
+     */
+    @GetMapping("list-tag")
+    public RestResponse findList(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);
+    }
+}

src/main/java/com/gic/plug/web/strategy/impl/StoreCustomBackImpl.java

@@ -38,24 +38,25 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
     private Map<Integer, String> methodMap = new HashMap<>();
 
     @PostConstruct
-    public void init(){
+    public void init() {
         methodMap.put(StoreFieldDateEnum.YMDHMS.getCode(), "yyyyMMddHHmmssBack");
         methodMap.put(StoreFieldDateEnum.YMD.getCode(), "yyyyMMddBack");
         methodMap.put(StoreFieldDateEnum.YM.getCode(), "yyyyMM");
         methodMap.put(StoreFieldDateEnum.MD.getCode(), "mmddBack");
         methodMap.put(StoreFieldDateEnum.Hms.getCode(), "hhmmssBack");
     }
+
     @Override
     public String screenBack(String compute, String value, String key, Integer enterpriseId) {
-        if(StringUtils.isNotBlank(value)) {
+        if (StringUtils.isNotBlank(value)) {
             Object cache = RedisUtil.getCache(StoreRedisKeyUtils.getStoreFieldKeyC(enterpriseId, key));
-            if(cache != null){
+            if (cache != null) {
                 ServiceResponse<StoreFieldDTO> storeField = this.storeFieldApiService.getStoreField((Integer) cache);
-                if(storeField.isSuccess()){
-                    if(storeField.getResult() != null){
-                        if(storeField.getResult().getStoreFieldType() == StoreFieldTypeEnum.DATE.getCode()){
+                if (storeField.isSuccess()) {
+                    if (storeField.getResult() != null) {
+                        if (storeField.getResult().getStoreFieldType() == StoreFieldTypeEnum.DATE.getCode()) {
                             return this.dateBack(compute, value, storeField.getResult());
-                        }else {
+                        } else {
                             return this.selectBack(compute, value, enterpriseId, storeField.getResult());
                         }
                     }
@@ -65,18 +66,18 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
         return null;
     }
 
-    private String dateBack(String compute, String value, StoreFieldDTO storeFieldDTO){
+    private String dateBack(String compute, String value, StoreFieldDTO storeFieldDTO) {
         StringBuilder stringBuilder = new StringBuilder(storeFieldDTO.getStoreFieldName()).append(" ");
         stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" ");
         JSONObject jsonObject = JSON.parseObject(storeFieldDTO.getStoreFieldDetail());
         int dateType = jsonObject.getIntValue("dateType");
         String methodName = this.methodMap.get(dateType);
-        if(StringUtils.isNotBlank(methodName)){
+        if (StringUtils.isNotBlank(methodName)) {
             try {
                 try {
                     Method method = this.getClass().getMethod(methodName, Class.forName(value.getClass().getCanonicalName()));
                     try {
-                        String message = (String)method.invoke(this, value);
+                        String message = (String) method.invoke(this, value);
                         return stringBuilder.append(message).toString();
                     } catch (IllegalAccessException e) {
                         e.printStackTrace();
@@ -93,19 +94,19 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
         return null;
     }
 
-    private String selectBack(String compute, String value, Integer enterpriseId, StoreFieldDTO storeFieldDTO){
+    private String selectBack(String compute, String value, Integer enterpriseId, StoreFieldDTO storeFieldDTO) {
         StringBuilder stringBuilder = new StringBuilder(storeFieldDTO.getStoreFieldName()).append(" ");
         stringBuilder.append(ComputeBackUtil.getComputeBack(compute)).append(" ");
         List<Integer> list = new ArrayList<>();
         String[] valueArr = value.split(" ");
-        for(String s : valueArr){
+        for (String s : valueArr) {
             list.add(Integer.valueOf(s));
         }
         ServiceResponse<List<StoreFieldSelectDTO>> listServiceResponse = this.storeFieldSelectApiService.listStoreFieldSelectByIds(enterpriseId, list);
-        if(listServiceResponse.isSuccess()){
+        if (listServiceResponse.isSuccess()) {
             List<StoreFieldSelectDTO> selectDTOS = listServiceResponse.getResult();
-            if(CollectionUtils.isNotEmpty(selectDTOS)){
-                for(StoreFieldSelectDTO dto : selectDTOS){
+            if (CollectionUtils.isNotEmpty(selectDTOS)) {
+                for (StoreFieldSelectDTO dto : selectDTOS) {
                     stringBuilder.append("【").append(dto.getStoreFieldSelectName()).append("】").append(" ");
                 }
             }
@@ -118,31 +119,36 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
     }
+
     public String yyyyMMddBack(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
         return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
     }
+
     public String yyyyMM(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMM");
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM");
         return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
     }
+
     public String mmddBack(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MMdd");
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("MM-dd");
         return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
     }
+
     public String hhmmssBack(String value) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HHmmss");
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm:ss");
         return this.dateBack(value, simpleDateFormat, simpleDateFormat1);
     }
+
     private String dateBack(String value, SimpleDateFormat simpleDateFormat, SimpleDateFormat simpleDateFormat1) throws ParseException {
         String[] valueArr = value.split(",");
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("【").append(simpleDateFormat1.format(simpleDateFormat.parse(valueArr[0]))).append("】").append(" ");
-        if(valueArr.length > 1){
+        if (valueArr.length > 1) {
             stringBuilder.append("至");
             stringBuilder.append("【").append(simpleDateFormat1.format(simpleDateFormat.parse(valueArr[1]))).append("】").append(" ");
         }

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

+package com.gic.plug.web.vo.goods;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CategoryVO implements Serializable {
+
+    private static final long serialVersionUID = -8126896401928702304L;
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long specCategoryId;
+
+    /**
+     * 类目名称
+     */
+    private String specCategoryName;
+
+    /**
+     * 类目code
+     */
+    private String specCategoryCode;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     * 0未删除 1删除
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 关联商品域id
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long goodsDomainId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 关联品类组的id
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long specCategoryGroupId;
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 关联将来统一的品类id
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long gicCategoryId;
+
+    /**
+     * 关联将来统一的品类code
+     */
+    private String gicCategoryCode;
+
+    /**
+     * 关联将来统一的品类id
+     */
+    private String gicCategoryName;
+
+    /**
+     * 是否是传入父品类的子类
+     */
+    private Boolean isSelected;
+
+    public Long getSpecCategoryId() {
+        return specCategoryId;
+    }
+
+    public void setSpecCategoryId(Long specCategoryId) {
+        this.specCategoryId = specCategoryId;
+    }
+
+    public String getSpecCategoryName() {
+        return specCategoryName;
+    }
+
+    public void setSpecCategoryName(String specCategoryName) {
+        this.specCategoryName = specCategoryName;
+    }
+
+    public String getSpecCategoryCode() {
+        return specCategoryCode;
+    }
+
+    public void setSpecCategoryCode(String specCategoryCode) {
+        this.specCategoryCode = specCategoryCode;
+    }
+
+    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 Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Long getGoodsDomainId() {
+        return goodsDomainId;
+    }
+
+    public void setGoodsDomainId(Long goodsDomainId) {
+        this.goodsDomainId = goodsDomainId;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Long getSpecCategoryGroupId() {
+        return specCategoryGroupId;
+    }
+
+    public void setSpecCategoryGroupId(Long specCategoryGroupId) {
+        this.specCategoryGroupId = specCategoryGroupId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getGicCategoryId() {
+        return gicCategoryId;
+    }
+
+    public void setGicCategoryId(Long gicCategoryId) {
+        this.gicCategoryId = gicCategoryId;
+    }
+
+    public String getGicCategoryCode() {
+        return gicCategoryCode;
+    }
+
+    public void setGicCategoryCode(String gicCategoryCode) {
+        this.gicCategoryCode = gicCategoryCode;
+    }
+
+    public String getGicCategoryName() {
+        return gicCategoryName;
+    }
+
+    public void setGicCategoryName(String gicCategoryName) {
+        this.gicCategoryName = gicCategoryName;
+    }
+
+    public Boolean getSelected() {
+        return isSelected;
+    }
+
+    public void setSelected(Boolean selected) {
+        isSelected = selected;
+    }
+}

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

+package com.gic.plug.web.vo.goods;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+  * @ClassName: GoodsCordVO
+  * @Description: 商品分组表
+  * @author xub
+  * @date 2019/8/29 上午10:16
+  */
+public class GoodsCordVO {
+    /**
+     * 主键ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long specCordId;
+    /**
+     * 商户ID
+     */
+    private Integer enterpriseId;
+    /**
+     * 域ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long goodsDomainId;
+    /**
+     * 分类名称
+     */
+    private String specCordName;
+    /**
+     * 分类code
+     */
+    private String specCordCode;
+    /**
+     * 父级分类ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long specParentId;
+    /**
+     * 分类ID链 格式: _ID_ID_..父级ID_自身ID_
+     */
+    private String specTagChain;
+    /**
+     * 是否叶子节点 0:不是叶子节点 1:是叶子节点
+     */
+    private Integer leafNodeFlag;
+
+    /**
+     * 是否在小程序上显示 0否 1是
+     */
+    private Integer displayAppFlag;
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    public Long getSpecCordId() {
+        return specCordId;
+    }
+
+    public void setSpecCordId(Long specCordId) {
+        this.specCordId = specCordId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getGoodsDomainId() {
+        return goodsDomainId;
+    }
+
+    public void setGoodsDomainId(Long goodsDomainId) {
+        this.goodsDomainId = goodsDomainId;
+    }
+
+    public String getSpecCordName() {
+        return specCordName;
+    }
+
+    public void setSpecCordName(String specCordName) {
+        this.specCordName = specCordName;
+    }
+
+    public String getSpecCordCode() {
+        return specCordCode;
+    }
+
+    public void setSpecCordCode(String specCordCode) {
+        this.specCordCode = specCordCode;
+    }
+
+    public Long getSpecParentId() {
+        return specParentId;
+    }
+
+    public void setSpecParentId(Long specParentId) {
+        this.specParentId = specParentId;
+    }
+
+    public String getSpecTagChain() {
+        return specTagChain;
+    }
+
+    public void setSpecTagChain(String specTagChain) {
+        this.specTagChain = specTagChain;
+    }
+
+    public Integer getLeafNodeFlag() {
+        return leafNodeFlag;
+    }
+
+    public void setLeafNodeFlag(Integer leafNodeFlag) {
+        this.leafNodeFlag = leafNodeFlag;
+    }
+
+    public Integer getDisplayAppFlag() {
+        return displayAppFlag;
+    }
+
+    public void setDisplayAppFlag(Integer displayAppFlag) {
+        this.displayAppFlag = displayAppFlag;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+}
\ No newline at end of file

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

+package com.gic.plug.web.vo.goods;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+  * @ClassName: GoodsTagVO
+  * @Description: 标签VO
+  * @author xub
+  * @date 2019/8/29 上午10:06
+  */
+public class GoodsTagVO {
+    /**
+     * 标签ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long specTagId;
+    /**
+     * 企业ID
+     */
+    private Integer enterpriseId;
+    /**
+     * 域ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long goodsDomainId;
+
+    /**
+     * 标签名称
+     */
+    private String specTagName;
+    /**
+     * 标签code
+     */
+    private String specTagCode;
+
+    public Long getSpecTagId() {
+        return specTagId;
+    }
+
+    public void setSpecTagId(Long specTagId) {
+        this.specTagId = specTagId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getGoodsDomainId() {
+        return goodsDomainId;
+    }
+
+    public void setGoodsDomainId(Long goodsDomainId) {
+        this.goodsDomainId = goodsDomainId;
+    }
+
+    public String getSpecTagName() {
+        return specTagName;
+    }
+
+    public void setSpecTagName(String specTagName) {
+        this.specTagName = specTagName;
+    }
+
+    public String getSpecTagCode() {
+        return specTagCode;
+    }
+
+    public void setSpecTagCode(String specTagCode) {
+        this.specTagCode = specTagCode;
+    }
+
+}
\ No newline at end of file