Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -13,6 +13,8 @@ import com.gic.enterprise.web.vo.index.MemberCardInfoVO;
 import com.gic.member.config.api.dto.*;
 import com.gic.member.config.api.service.UserListFieldApiService;
 import com.gic.platform.member.constant.enums.CuTypeEnum;
+import com.gic.store.constant.StoreESFieldsEnum;
+import com.gic.store.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -49,9 +51,6 @@ import com.gic.member.config.api.service.ServiceConfigApiService;
 import com.gic.store.dto.CityDTO;
 import com.gic.store.dto.ProvinceDTO;
 import com.gic.store.dto.StoreSearchDTO;
-import com.gic.store.service.ProvincesApiService;
-import com.gic.store.service.StoreApiService;
-import com.gic.store.service.StoreWidgetApiService;
 
 /**
  *
@@ -86,6 +85,8 @@ public class IndexModuleController {
     private ServiceConfigApiService serviceConfigApiService;
     @Autowired
     private UserListFieldApiService userListFieldApiService;
+    @Autowired
+    private StoreResourceApiService storeResourceApiService;
 
     @RequestMapping("/list-index-module")
     public RestResponse listIndexModule() {
@@ -453,40 +454,24 @@ public class IndexModuleController {
         return ResultControllerUtils.commonResult(this.memberDataApiService.consumptionAnalysis(param));
     }
 
+    /**
+     * 首页-会员卡/小程序/服务号
+     * @return
+     */
     @RequestMapping("list-resource")
     public RestResponse listResource(){
-        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
-        List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAll(enterpriseId).getResult();
-        List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listValidAppletConfigAppId(enterpriseId).getResult();
-        List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listValidServiceConfigAppId(enterpriseId).getResult();
+        List<MemberCardInfoVO> memberCardList = getAreaData(UserDetailUtils.getUserDetail().getUserId(),
+                UserDetailUtils.getUserDetail().getEnterpriseId(), CuTypeEnum.MCU);
+        List<MemberCardInfoVO> appletList = getAreaData(UserDetailUtils.getUserDetail().getUserId(),
+                UserDetailUtils.getUserDetail().getEnterpriseId(), CuTypeEnum.ACU);
+        List<MemberCardInfoVO> serviceList = getAreaData(UserDetailUtils.getUserDetail().getUserId(),
+                UserDetailUtils.getUserDetail().getEnterpriseId(), CuTypeEnum.SCU);
+
         Map<String, Object> result = new HashMap<>();
-        List<ResouceVO> applet = new ArrayList<>();
-        List<ResouceVO> service = new ArrayList<>();
-        List<ResouceVO> card = new ArrayList<>();
-        if( CollectionUtils.isNotEmpty(appletList)){
-            for(AppletsConfigSimpleOutputDTO dto : appletList){
-                ResouceVO vo = new ResouceVO();
-                vo.setId(dto.getAppletConfigId());
-                vo.setName(dto.getAppletConfigName());
-                applet.add(vo);
-            }
-        }
-        if(CollectionUtils.isNotEmpty(serviceList)){
-            for(ServiceConfigSimpleOutputDTO dto : serviceList){
-                ResouceVO vo = new ResouceVO();
-                vo.setId(dto.getServiceConfigId());
-                vo.setName(dto.getServiceConfigName());
-                service.add(vo);
-            }
-        }
-        if(CollectionUtils.isNotEmpty(memberCardList)){
-            for(OwnerMemberCardDTO dto : memberCardList){
-                ResouceVO vo = new ResouceVO();
-                vo.setId(dto.getCardConfigId());
-                vo.setName(dto.getCardName());
-                card.add(vo);
-            }
-        }
+        List<ResouceVO> applet = getResource(appletList);
+        List<ResouceVO> service = getResource(serviceList);
+        List<ResouceVO> card = getResource(memberCardList);
+
         result.put("card", card);
         result.put("service", service);
         result.put("applet", applet);
@@ -494,6 +479,30 @@ public class IndexModuleController {
         return RestResponse.success(result);
     }
 
+    /**
+     * 首页-品牌列表
+     * @return
+     */
+    @RequestMapping("list-brand-of-index")
+    public RestResponse listBrand() {
+        return ResultControllerUtils.commonResult(storeResourceApiService
+                .getAuthDataFromStoreWidget(UserDetailUtils.getUserDetail().getUserId(), StoreESFieldsEnum.STOREBRANDIDLIST.getField()));
+    }
+
+    private List<ResouceVO> getResource(List<MemberCardInfoVO> list) {
+        List<ResouceVO> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for(MemberCardInfoVO dto : list){
+                ResouceVO vo = new ResouceVO();
+                vo.setId(Long.valueOf(dto.getMbrAreaId()));
+                vo.setName(dto.getMbrAreaName());
+                vo.setOwnType(dto.getOwnType());
+                result.add(vo);
+            }
+        }
+        return result;
+    }
+
     private List<Integer> getLegend(Integer enterpriseId, String provinceId){
         Integer storeNum = this.getStoreNum(enterpriseId, null, provinceId);
         List<Integer> legend = new ArrayList<>();

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/ResouceVO.java

@@ -11,6 +11,7 @@ import java.io.Serializable;
 public class ResouceVO implements Serializable {
     private Long id;
     private String name;
+    private Integer ownType;
 
     public Long getId() {
         return id;
@@ -28,11 +29,21 @@ public class ResouceVO implements Serializable {
         this.name = name;
     }
 
+    public Integer getOwnType() {
+        return ownType;
+    }
+
+    public ResouceVO setOwnType(Integer ownType) {
+        this.ownType = ownType;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "ResouceVO{" +
                 "id=" + id +
                 ", name='" + name + '\'' +
+                ", ownType=" + ownType +
                 '}';
     }
 }

gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml

@@ -158,4 +158,5 @@
     <dubbo:reference interface="com.gic.enterprise.service.BlackListApiService" id="blackListApiService" timeout="6000" />
 
     <dubbo:reference interface="com.gic.member.config.api.service.UserListFieldApiService" id="userListFieldApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.store.service.StoreResourceApiService" id="storeResourceApiService" timeout="6000" retries="0"/>
 </beans>