Merge branch 'developer' of…

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

pom.xml

@@ -24,6 +24,8 @@
         <gic-thirdparty-sdk>4.0-SNAPSHOT</gic-thirdparty-sdk>
         <gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
         <gic-goods-api>4.0-SNAPSHOT</gic-goods-api>
+        <gic-mall-share-api>4.0-SNAPSHOT</gic-mall-share-api>
+        <gic-member-config-api>4.0-SNAPSHOT</gic-member-config-api>
     </properties>
 
     <dependencies>
@@ -76,7 +78,11 @@
             <artifactId>gic-goods-api</artifactId>
             <version>${gic-goods-api}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-member-config-api</artifactId>
+            <version>${gic-member-config-api}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -144,6 +150,11 @@
             <artifactId>gic-search-business-api</artifactId>
             <version>${gic-search-business-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-mall-share-api</artifactId>
+            <version>${gic-mall-share-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -16,6 +16,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.contants.SortType;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.goods.api.dto.BrandDTO;
 import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
 import com.gic.goods.api.service.BrandApiService;
@@ -34,14 +35,14 @@ public class GoodsBrandController {
 
     @RequestMapping("/goods-brand-list")
     public RestResponse goodsBrandList(int pageSize, int currentPage, String search, Long goodsDomainId, String channelCode) {
-        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(Constant.TEST_GOODS_RIGHTS_SELECTOR_ID, Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(), Constant.TEST_ENTERPRISE_ID);
         if (!selectorDTOServiceResponse.isSuccess() || selectorDTOServiceResponse.getResult() == null ||
                 selectorDTOServiceResponse.getResult().getHasRights() == Constant.NO) {
             return RestResponse.success(Collections.EMPTY_LIST);
         }
         // 是否最高权限
         List<Long> branIdList = new ArrayList<>();
-        if (Constant.TEST_GOODS_RIGHTS_SELECTOR_ID != null) {
+        if (UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId() != null) {
             if (selectorDTOServiceResponse.isSuccess()) {
                 GoodsRightsSelectorDTO goodsRightsSelectorDTO = selectorDTOServiceResponse.getResult();
                 if (goodsRightsSelectorDTO != null) {

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

@@ -60,6 +60,9 @@ public class GoodsController {
     }
 
 
+
+
+
     /**
      * @Description: 查询所有（不分页）
      * @author xub
@@ -106,6 +109,8 @@ public class GoodsController {
     }
 
 
+
+
     private ServiceResponse<ESResponseQueryBatchDTO> searchES( Integer currentPage,Integer pageSize, Long goodsDomainId,String search,String channelCode) {
         DynamicSearchDTO searchDTO = new DynamicSearchDTO();
         String esName = esScreeningSearchService.getCurrentEsName("goods-test-123456", "goods-search");

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

@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.goods.api.dto.GoodsDomainDTO;
 import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
 import com.gic.goods.api.service.GoodsDomainApiService;
@@ -53,7 +54,7 @@ public class GoodsDomainController {
     */
     @RequestMapping("/get-all-goods-domain-list")
     public RestResponse getAllGoodsDomianList() {
-        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(Constant.TEST_GOODS_RIGHTS_SELECTOR_ID, Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsRightsSelectorDTO> selectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(), Constant.TEST_ENTERPRISE_ID);
         if (!selectorDTOServiceResponse.isSuccess() || selectorDTOServiceResponse.getResult() == null ||
                 selectorDTOServiceResponse.getResult().getHasRights() == Constant.NO) {
             return RestResponse.success(Collections.EMPTY_LIST);
@@ -62,7 +63,7 @@ public class GoodsDomainController {
         // 是否最高权限
         boolean isHighestRights = true;
         JSONObject json = null;
-        if (Constant.TEST_GOODS_RIGHTS_SELECTOR_ID != null) {
+        if (UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId() != null) {
             isHighestRights = false;
             if (selectorDTOServiceResponse.isSuccess()) {
                 GoodsRightsSelectorDTO goodsRightsSelectorDTO = selectorDTOServiceResponse.getResult();

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

@@ -88,4 +88,6 @@ public class GoodsRightsSelectorController {
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
+
+
 }

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

@@ -7,11 +7,13 @@ 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.enterprise.utils.UserDetailUtils;
 import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
 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.mall.base.api.enums.ErrorCodeEnums;
 import com.gic.plug.web.qo.goods.GoodsSelectorSaveQO;
 import com.gic.plug.web.qo.goods.GoodsSelectorUpdateQO;
 import com.gic.plug.web.vo.goods.GoodsSelectorVO;
@@ -58,7 +60,7 @@ public class GoodsSelectorController {
     public RestResponse goodsSelectorSave(GoodsSelectorSaveQO goodsSelectorSaveQO) {
         GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorSaveQO);
         goodsSelectorDTO.setEnterpriseId(Constant.TEST_ENTERPRISE_ID);
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(Constant.TEST_GOODS_RIGHTS_SELECTOR_ID, Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(), Constant.TEST_ENTERPRISE_ID);
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
         }
@@ -79,7 +81,7 @@ public class GoodsSelectorController {
     public RestResponse goodsSelectorShow(GoodsSelectorSaveQO goodsSelectorSaveQO) {
         GoodsSelectorDTO goodsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsSelectorDTO.class, goodsSelectorSaveQO);
         goodsSelectorDTO.setEnterpriseId(Constant.TEST_ENTERPRISE_ID);
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(Constant.TEST_GOODS_RIGHTS_SELECTOR_ID, Constant.TEST_ENTERPRISE_ID);
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(), Constant.TEST_ENTERPRISE_ID);
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
         }
@@ -99,7 +101,19 @@ public class GoodsSelectorController {
 
     @RequestMapping("change-goods-rights-for-selector")
     public RestResponse changeGoodsRightsForSelector(Long goodsSelectorId) {
-        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(Constant.TEST_GOODS_RIGHTS_SELECTOR_ID, Constant.TEST_ENTERPRISE_ID);
+        if (goodsSelectorId == null) {
+            ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(),
+                    Constant.TEST_ENTERPRISE_ID);
+            if (serviceResponse.getResult() == null) {
+                return RestResponse.failure(ErrorCodeEnums.MAll_ERR.getCode(), "没有权限");
+            }
+            GoodsRightsSelectorDTO goodsRightsSelectorDTO = new GoodsRightsSelectorDTO();
+            goodsRightsSelectorDTO.setHasRights(serviceResponse.getResult().getHasRights());
+            goodsRightsSelectorDTO.setGoodsRightsSearchText(serviceResponse.getResult().getGoodsRightsSearchText());
+            goodsRightsSelectorDTO.setGoodsRightsSearchValue(serviceResponse.getResult().getGoodsRightsSearchValue());
+            return RestResponse.success(goodsRightsSelectorDTO);
+        }
+        ServiceResponse<GoodsRightsSelectorDTO> goodsRightsSelectorDTOServiceResponse = goodsRightsSelectorApiService.getGoodsRightsSelector(UserDetailUtils.getUserDetail().getUserResourceInfo().getGoodsResourceId(), Constant.TEST_ENTERPRISE_ID);
         if (!goodsRightsSelectorDTOServiceResponse.isSuccess()) {
             return RestResponse.failure(goodsRightsSelectorDTOServiceResponse.getCode(), goodsRightsSelectorDTOServiceResponse.getMessage());
         }

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

@@ -6,6 +6,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.plug.web.strategy.ScreenBackStrategy;
 import com.gic.plug.web.utils.ComputeBackUtil;
 import com.gic.store.constant.StoreESFieldsEnum;
+import com.gic.store.dto.StoreDTO;
 import com.gic.store.dto.StoreSearchDTO;
 import com.gic.store.service.StoreApiService;
 import org.apache.commons.collections.CollectionUtils;
@@ -27,11 +28,12 @@ public class StoreBackImpl implements ScreenBackStrategy {
             StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
             storeSearchDTO.setEnterpriseId(enterpriseId);
             storeSearchDTO.setStoreIds(value);
-            ServiceResponse response = this.storeApiService.listStore(storeSearchDTO, 1, 50, StoreESFieldsEnum.STORENAME.getField());
+            ServiceResponse<Page<StoreDTO>> response = this.storeApiService.listStore(storeSearchDTO, 1, 50, StoreESFieldsEnum.STORENAME.getField());
             if(response.isSuccess()){
-                List<JSONObject> list = ((Page)response.getResult()).getResult();
+                List<StoreDTO> list = ((Page)response.getResult()).getResult();
                 if(CollectionUtils.isNotEmpty(list)){
-                    for(JSONObject jsonObject : list){
+                    for (StoreDTO storeDTO : list) {
+                        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(storeDTO);
                         stringBuilder.append("【").append(jsonObject.getString(StoreESFieldsEnum.STORENAME.getField())).append("】").append(" ");
                     }
                 }

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

+package com.gic.plug.web.vo.goods;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class MallGoodsCordVO {
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long specCordId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    private Long goodsDomainId;
+
+    /**
+     * 分类名称
+     */
+    private String specCordName;
+
+    /**
+     * 父级分类ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long specParentId;
+
+    /**
+     * 是否叶子节点 0:不是叶子节点 1:是叶子节点
+     */
+    private Integer leafNodeFlag;
+
+    /**
+     * 是否在小程序上显示 0否 1是
+     */
+    private Integer displayAppFlag;
+
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 关联商品数量
+     */
+    private Integer cordGoodsCount;
+
+    /**
+     * 二级分类
+     */
+    private List<MallGoodsCordVO> childSpecCordDTOList;
+
+    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 Long getSpecParentId() {
+        return specParentId;
+    }
+
+    public void setSpecParentId(Long specParentId) {
+        this.specParentId = specParentId;
+    }
+
+    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;
+    }
+
+    public Integer getCordGoodsCount() {
+        return cordGoodsCount;
+    }
+
+    public void setCordGoodsCount(Integer cordGoodsCount) {
+        this.cordGoodsCount = cordGoodsCount;
+    }
+
+    public List<MallGoodsCordVO> getChildSpecCordDTOList() {
+        return childSpecCordDTOList;
+    }
+
+    public void setChildSpecCordDTOList(List<MallGoodsCordVO> childSpecCordDTOList) {
+        this.childSpecCordDTOList = childSpecCordDTOList;
+    }
+}

src/main/resources/application.yml

@@ -4,6 +4,7 @@ server:
     context-path: /api-plug
   tomcat:
     uri-encoding: UTF-8
+    basedir: /tmp/tomcat
 
 spring:
   jackson:

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

@@ -47,6 +47,7 @@
     <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.goods.api.service.MallGoodsBusinessApiService" id="mallGoodsBusinessApiService" timeout="60000" retries="0" check="false"/>
 
     <dubbo:reference interface="com.gic.search.business.api.service.EsBusinessOperaApiService" id="esBusinessOperaApiService" timeout="60000" retries="0" />
 
@@ -54,5 +55,7 @@
 
     <dubbo:reference interface="com.gic.widget.screening.api.service.EsScreeningSearchService" id="esScreeningSearchService" timeout="60000" retries="0" />
     <dubbo:reference interface="com.gic.store.service.StoreWidgetApiService" id="storeWidgetApiService" timeout="60000" retries="0" />
+    <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="10000" retries="0" />
+    <dubbo:reference interface="com.gic.member.config.api.service.AppletsConfigApiService" id="appletsConfigApiService" timeout="10000" retries="0" />
 
 </beans>
\ No newline at end of file