首页-会员概览-右侧调整

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

@@ -381,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

@@ -302,18 +302,19 @@ public class IndexModuleController {
 
     /**
      * 首页-会员概览-右侧
-     * @param type
+     * @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();
         IndexMemberOverviewQO param = new IndexMemberOverviewQO();
         param.setEntId(enterpriseId);
         param.setAuthStoreIdList(this.getAuthStore());
-        param.setType(type);
-        param.setMemberCardIdList(getAuthMemberCardList(null, enterpriseId, userId));
+        param.setBrandId(brandId);
+        param.setMemberCardIdList(getAuthMemberCardList(cardAreaId, enterpriseId, userId));
         ServiceResponse<IndexMemberOverviewTotalDTO> memberData = this.memberDataApiService.getMemberData(param);
 
         IndexMemberOverviewTotalDTO data = memberData.getResult();
@@ -322,6 +323,10 @@ public class IndexModuleController {
         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);

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

@@ -25,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;
     }
@@ -73,6 +88,33 @@ 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 "MemberDataRightVO{" +
@@ -82,6 +124,9 @@ public class MemberDataRightVO implements Serializable {
                 ", newMonthMemberCount=" + newMonthMemberCount +
                 ", newDayMemberRate='" + newDayMemberRate + '\'' +
                 ", newMonthMemberRate='" + newMonthMemberRate + '\'' +
+                ", brandServiceTotal=" + brandServiceTotal +
+                ", belongBrandServiceTotal=" + belongBrandServiceTotal +
+                ", openCardTotal=" + openCardTotal +
                 '}';
     }
 }