Merge branch 'developer' of…

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

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletCustomPageApiServiceImpl.java

@@ -364,6 +364,9 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
         if (!AppletPageTypeEnum.needCrowdWidget(record.getPageType())) {
             throw new CommonException(ErrorCode.PARAMETER_ERROR.getCode(), "页面种类错误，该页面没有序号");
         }
+        if (serialNumber > 999) {
+            throw new CommonException(ErrorCode.PARAMETER_ERROR.getCode(), "序号不能超过999");
+        }
         record.setSerialNumber(serialNumber);
         appletCustomPageService.edit(record);
         return ServiceResponse.success();
@@ -378,6 +381,7 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
         copy.setPageId(null);
         //未发布
         copy.setStatus(2);
+        copy.setTitle(record.getTitle() + "_copy");
         Integer newPageId = appletCustomPageService.save(copy);
         //复制组件数据
         List<TabAppletPageComponent> componentList = appletPageComponentService.listByPageId(pageId);

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

@@ -6,6 +6,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.gic.data.api.dto.index.IndexMemberOverviewDTO;
+import com.gic.data.api.dto.index.IndexMemberOverviewTotalDTO;
 import com.gic.data.api.qo.index.IndexMemberOverviewQO;
 import com.gic.enterprise.web.vo.index.MemberCardInfoVO;
 import com.gic.member.config.api.dto.*;
@@ -281,24 +282,54 @@ public class IndexModuleController {
         param.setAuthStoreIdList(this.getAuthStore());
         param.setType(type);
         param.setBrandId(brandId);
+        param.setMemberCardIdList(getAuthMemberCardList(cardAreaId, enterpriseId, userId));
+
+        ServiceResponse<List<IndexMemberOverviewDTO>> response = this.memberDataApiService.listMemberData(param);
+        return RestResponse.success(EntityUtil.changeEntityListByJSON(MemberDataVO.class, response.getResult()));
+    }
+
+    private List<Long> getAuthMemberCardList(Long cardAreaId, Integer enterpriseId, Integer userId) {
         if (cardAreaId != null) {
-            param.setMemberCardIdList(Arrays.asList(cardAreaId));
+            return Arrays.asList(cardAreaId);
         } else {
             List<MemberCardInfoVO> memberCardList = getMbrArea(userId, enterpriseId);
             if (CollectionUtils.isNotEmpty(memberCardList)) {
-                param.setMemberCardIdList(memberCardList.stream().mapToLong(e -> Long.valueOf(e.getMbrAreaId())).boxed().collect(Collectors.toList()));
+                return memberCardList.stream().mapToLong(e -> Long.valueOf(e.getMbrAreaId())).boxed().collect(Collectors.toList());
             }
         }
-        ServiceResponse<List<IndexMemberOverviewDTO>> response = this.memberDataApiService.listMemberData(param);
-        return RestResponse.success(EntityUtil.changeEntityListByJSON(MemberDataVO.class, response.getResult()));
+        return null;
     }
 
+    /**
+     * 首页-会员概览-右侧
+     * @param cardAreaId
+     * @param brandId
+     * @return
+     */
     @RequestMapping("get-member-data")
-    public RestResponse getMemberData(Integer type){
+    public RestResponse getMemberData(Long cardAreaId, Integer brandId){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<MemberDataDTO> memberData = this.memberDataApiService.getMemberData(enterpriseId, type, userId, this.getAuthStore());
-        return RestResponse.success(EntityUtil.changeEntityByJSON(MemberDataRightVO.class, memberData.getResult()));
+        IndexMemberOverviewQO param = new IndexMemberOverviewQO();
+        param.setEntId(enterpriseId);
+        param.setAuthStoreIdList(this.getAuthStore());
+        param.setBrandId(brandId);
+        param.setMemberCardIdList(getAuthMemberCardList(cardAreaId, enterpriseId, userId));
+        ServiceResponse<IndexMemberOverviewTotalDTO> memberData = this.memberDataApiService.getMemberData(param);
+
+        IndexMemberOverviewTotalDTO data = memberData.getResult();
+        MemberDataRightVO vo = new MemberDataRightVO();
+        vo.setNewDayMemberCount(data.getNewMemberOfDay());
+        vo.setNewDayMemberRate(data.getNewMemberRateOfDay());
+        vo.setNewMonthMemberCount(data.getNewMemberOfMonth());
+        vo.setNewMonthMemberRate(data.getNewMemberRateOfMonth());
+
+        vo.setOpenCardTotal(data.getOpenCardTotal());
+        vo.setBrandServiceTotal(data.getBrandServiceTotal());
+        vo.setBelongBrandServiceTotal(data.getBelongBrandServiceTotal());
+        //开卡门店招募总数
+        vo.setOpenStoreMemberAllCount(data.getOpenCardTotal());
+        return RestResponse.success(vo);
     }
 
     @RequestMapping("list-member-channel-data")

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

 package com.gic.enterprise.web.vo;
 
-import com.alibaba.fastjson.JSON;
 
 import java.io.Serializable;
 
@@ -26,6 +25,21 @@ public class MemberDataRightVO implements Serializable {
 
     private String newMonthMemberRate;
 
+    /**
+     * 品牌服务门店总数
+     */
+    private Integer brandServiceTotal;
+
+    /**
+     * 归属品牌服务门店总数
+     */
+    private Integer belongBrandServiceTotal;
+
+    /**
+     * 开卡门店会员总数
+     */
+    private Integer openCardTotal;
+
     public Integer getServiceStoreMemberAllCount() {
         return serviceStoreMemberAllCount;
     }
@@ -74,8 +88,45 @@ public class MemberDataRightVO implements Serializable {
         this.newMonthMemberRate = newMonthMemberRate;
     }
 
+    public Integer getBrandServiceTotal() {
+        return brandServiceTotal;
+    }
+
+    public MemberDataRightVO setBrandServiceTotal(Integer brandServiceTotal) {
+        this.brandServiceTotal = brandServiceTotal;
+        return this;
+    }
+
+    public Integer getBelongBrandServiceTotal() {
+        return belongBrandServiceTotal;
+    }
+
+    public MemberDataRightVO setBelongBrandServiceTotal(Integer belongBrandServiceTotal) {
+        this.belongBrandServiceTotal = belongBrandServiceTotal;
+        return this;
+    }
+
+    public Integer getOpenCardTotal() {
+        return openCardTotal;
+    }
+
+    public MemberDataRightVO setOpenCardTotal(Integer openCardTotal) {
+        this.openCardTotal = openCardTotal;
+        return this;
+    }
+
     @Override
     public String toString() {
-        return JSON.toJSONString(this);
+        return "MemberDataRightVO{" +
+                "serviceStoreMemberAllCount=" + serviceStoreMemberAllCount +
+                ", openStoreMemberAllCount=" + openStoreMemberAllCount +
+                ", newDayMemberCount=" + newDayMemberCount +
+                ", newMonthMemberCount=" + newMonthMemberCount +
+                ", newDayMemberRate='" + newDayMemberRate + '\'' +
+                ", newMonthMemberRate='" + newMonthMemberRate + '\'' +
+                ", brandServiceTotal=" + brandServiceTotal +
+                ", belongBrandServiceTotal=" + belongBrandServiceTotal +
+                ", openCardTotal=" + openCardTotal +
+                '}';
     }
 }