From be1cd320ccc2d80f5c7e6094ec96f8b43e00f8d9 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Mon, 9 Oct 2023 16:13:34 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6=E8=88=B1=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatower/CockpitScreenController.java | 24 +++++++++++++ .../domain/vo/cockpit/CountBasicVO.java | 33 +++++++++++++++++ .../domain/vo/cockpit/CountOrderTrendVO.java | 36 +++++++++++++++++++ .../service/CockpitScreenService.java | 29 +++++++++++++-- .../impl/CockpitScreenServiceImpl.java | 15 ++++++++ 5 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountBasicVO.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountOrderTrendVO.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/CockpitScreenController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/CockpitScreenController.java index 8c2ea3c15..c828d0e8e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/CockpitScreenController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/CockpitScreenController.java @@ -55,4 +55,28 @@ public class CockpitScreenController extends BaseController { public ResultData countReachUser(@RequestParam("years") List years) { return new ResultData(cockpitScreenService.countReachUser(getTenantInfo(), years)); } + + @ApiVersion(group = SwaggerConstant.V_1_0_0) + @TenantIgnore + @ApiOperation("驾驶舱大屏-车辆数量信息") + @GetMapping("/countCar") + public ResultData countCar(@RequestParam("years") List years) { + return new ResultData(cockpitScreenService.countCar(getTenantInfo(), years)); + } + + @ApiVersion(group = SwaggerConstant.V_1_0_0) + @TenantIgnore + @ApiOperation("驾驶舱大屏-订单趋势") + @GetMapping("/countOrderTrend") + public ResultData countOrderTrend(@RequestParam("year") Integer year) { + return new ResultData(cockpitScreenService.countOrderTrend(getTenantInfo(), year)); + } + + @ApiVersion(group = SwaggerConstant.V_1_0_0) + @TenantIgnore + @ApiOperation("驾驶舱大屏-基本信息") + @GetMapping("/countBasic") + public ResultData countBasic() { + return new ResultData(cockpitScreenService.countBasic()); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountBasicVO.java b/mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountBasicVO.java new file mode 100644 index 000000000..ba752e013 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountBasicVO.java @@ -0,0 +1,33 @@ +package com.iformall.domain.vo.cockpit; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@ApiModel(value = "基本数据信息") +@Data +public class CountBasicVO { + @ApiModelProperty(value = "总交易额") + private BigDecimal totalTradingAmount; + @ApiModelProperty(value = "总核销额") + private BigDecimal totalVerifiedAmount; + @ApiModelProperty(value = "总商户数") + private BigDecimal totalMerchantCount; + @ApiModelProperty(value = "总会员数") + private BigDecimal totalUserCount; + @ApiModelProperty(value = "总触达用户数") + private BigDecimal totalReachUserCount; + @ApiModelProperty(value = "本周新增会员数") + private BigDecimal weekUserCount; + @ApiModelProperty(value = "总有车会员数") + private BigDecimal carUserCount; + + @ApiModelProperty(value = "今日访问量") + private BigDecimal todayPvCount; + @ApiModelProperty(value = "今日会员数") + private BigDecimal todayUserCount; + @ApiModelProperty(value = "今日交易金额") + private BigDecimal todayTradingAmount; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountOrderTrendVO.java b/mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountOrderTrendVO.java new file mode 100644 index 000000000..00283ab81 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/cockpit/CountOrderTrendVO.java @@ -0,0 +1,36 @@ +package com.iformall.domain.vo.cockpit; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@ApiModel(value = "订单趋势") +@Data +public class CountOrderTrendVO { + @ApiModelProperty(value = "月份") + private Integer month; + @ApiModelProperty(value = "订单信息") + private OrderInfo order; + @ApiModelProperty(value = "核销订单信息") + private VerifiedOrderInfo verifiedOrder; + + @Data + public static class OrderInfo { + @ApiModelProperty(value = "订单金额") + private BigDecimal orderAmount; + @ApiModelProperty(value = "订单数量") + private Integer orderCount; + } + + @Data + public static class VerifiedOrderInfo { + @ApiModelProperty(value = "订单核销金额") + private BigDecimal verifiedOrderAmount; + @ApiModelProperty(value = "订单核销数") + private Integer verifiedOrderCount; + @ApiModelProperty(value = "订单核销用户数") + private Integer verifiedUserCount; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/CockpitScreenService.java b/mallinkService/src/main/java/com/iformall/service/CockpitScreenService.java index 6d5fcf588..55b95b7e7 100644 --- a/mallinkService/src/main/java/com/iformall/service/CockpitScreenService.java +++ b/mallinkService/src/main/java/com/iformall/service/CockpitScreenService.java @@ -1,9 +1,7 @@ package com.iformall.service; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.cockpit.CountMonthVO; -import com.iformall.domain.vo.cockpit.CountShopVO; -import com.iformall.domain.vo.cockpit.CountUserGenderVO; +import com.iformall.domain.vo.cockpit.*; import java.util.List; @@ -47,4 +45,29 @@ public interface CockpitScreenService { * @return {@link List}<{@link CountMonthVO}> */ List countReachUser(TenantEntity tenantInfo, List years); + + /** + * 统计车辆数量信息 + * + * @param tenantInfo + * @param years + * @return {@link List}<{@link CountMonthVO}> + */ + List countCar(TenantEntity tenantInfo, List years); + + /** + * 统计订单趋势信息 + * + * @param tenantInfo + * @param year + * @return {@link List}<{@link CountOrderTrendVO}> + */ + List countOrderTrend(TenantEntity tenantInfo, Integer year); + + /** + * 统计基本数据信息 + * + * @return {@link CountBasicVO} + */ + CountBasicVO countBasic(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java index 1dfeeb372..fdc02bbb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java @@ -154,4 +154,19 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { return result; } + + @Override + public List countCar(TenantEntity tenantInfo, List years) { + return null; + } + + @Override + public List countOrderTrend(TenantEntity tenantInfo, Integer year) { + return null; + } + + @Override + public CountBasicVO countBasic() { + return null; + } }