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

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.ChannelResourceDTO;
 import com.gic.auth.service.ResourceApiService;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.data.api.dto.*;
 import com.gic.data.api.service.MemberDataApiService;
@@ -16,6 +17,8 @@ import com.gic.enterprise.service.IndexModuleApiService;
 import com.gic.enterprise.service.PushMessageApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.enterprise.web.vo.MemberDataRightVO;
+import com.gic.enterprise.web.vo.MemberDataVO;
 import com.gic.enterprise.web.vo.ResouceVO;
 import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
 import com.gic.member.config.api.dto.OwnerMemberCardDTO;
@@ -244,7 +247,7 @@ public class IndexModuleController {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
         ServiceResponse<List<MemberDataDTO>> response = this.memberDataApiService.listMemberData(enterpriseId, type, cardAreaId, userId);
-        return RestResponse.success(response.getResult());
+        return RestResponse.success(EntityUtil.changeEntityListByJSON(MemberDataVO.class, response.getResult()));
     }
 
     @RequestMapping("get-member-data")
@@ -252,7 +255,7 @@ public class IndexModuleController {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
         ServiceResponse<MemberDataDTO> memberData = this.memberDataApiService.getMemberData(enterpriseId, type, userId);
-        return RestResponse.success(memberData.getResult());
+        return RestResponse.success(EntityUtil.changeEntityByJSON(MemberDataRightVO.class, memberData.getResult()));
     }
 
     @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;
+
+/**
+ * @author: liuzelin
+ * @date: 2020/4/21 16:04
+ * @description:
+ */
+public class MemberDataRightVO implements Serializable {
+    private static final long serialVersionUID = 7241937734014989108L;
+
+
+
+    private Integer serviceStoreMemberAllCount;
+
+    private Integer openStoreMemberAllCount;
+
+    private Integer newDayMemberCount;
+
+    private Integer newMonthMemberCount;
+
+    private String newDayMemberRate;
+
+    private String newMonthMemberRate;
+
+    public Integer getServiceStoreMemberAllCount() {
+        return serviceStoreMemberAllCount;
+    }
+
+    public void setServiceStoreMemberAllCount(Integer serviceStoreMemberAllCount) {
+        this.serviceStoreMemberAllCount = serviceStoreMemberAllCount;
+    }
+
+    public Integer getOpenStoreMemberAllCount() {
+        return openStoreMemberAllCount;
+    }
+
+    public void setOpenStoreMemberAllCount(Integer openStoreMemberAllCount) {
+        this.openStoreMemberAllCount = openStoreMemberAllCount;
+    }
+
+    public Integer getNewDayMemberCount() {
+        return newDayMemberCount;
+    }
+
+    public void setNewDayMemberCount(Integer newDayMemberCount) {
+        this.newDayMemberCount = newDayMemberCount;
+    }
+
+    public Integer getNewMonthMemberCount() {
+        return newMonthMemberCount;
+    }
+
+    public void setNewMonthMemberCount(Integer newMonthMemberCount) {
+        this.newMonthMemberCount = newMonthMemberCount;
+    }
+
+    public String getNewDayMemberRate() {
+        return newDayMemberRate;
+    }
+
+    public void setNewDayMemberRate(String newDayMemberRate) {
+        this.newDayMemberRate = newDayMemberRate;
+    }
+
+    public String getNewMonthMemberRate() {
+        return newMonthMemberRate;
+    }
+
+    public void setNewMonthMemberRate(String newMonthMemberRate) {
+        this.newMonthMemberRate = newMonthMemberRate;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}

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

+package com.gic.enterprise.web.vo;
+
+import com.alibaba.fastjson.JSON;
+
+import java.io.Serializable;
+
+/**
+ * @author: liuzelin
+ * @date: 2020/4/21 16:04
+ * @description:
+ */
+public class MemberDataVO implements Serializable {
+    private static final long serialVersionUID = 7241937734014989108L;
+
+    private String date;
+
+    private Integer newMemberCount;
+
+    private Integer serviceStoreMemberAllCount;
+
+    private Integer openStoreMemberAllCount;
+
+
+    public MemberDataVO(String date) {
+        this.date = date;
+    }
+
+    public MemberDataVO() {
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public Integer getNewMemberCount() {
+        return newMemberCount;
+    }
+
+    public void setNewMemberCount(Integer newMemberCount) {
+        this.newMemberCount = newMemberCount;
+    }
+
+    public Integer getServiceStoreMemberAllCount() {
+        return serviceStoreMemberAllCount;
+    }
+
+    public void setServiceStoreMemberAllCount(Integer serviceStoreMemberAllCount) {
+        this.serviceStoreMemberAllCount = serviceStoreMemberAllCount;
+    }
+
+    public Integer getOpenStoreMemberAllCount() {
+        return openStoreMemberAllCount;
+    }
+
+    public void setOpenStoreMemberAllCount(Integer openStoreMemberAllCount) {
+        this.openStoreMemberAllCount = openStoreMemberAllCount;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}