From ba714629588e22f9ffaab83819f6b9200a6397b3 Mon Sep 17 00:00:00 2001 From: zhanglin8526 <852614290@qq.com> Date: 星期五, 04 八月 2023 22:59:08 +0800 Subject: [PATCH] 1、定时任务 商户进件状态查询 2、小程序下单统一支付提交 3、订单核销分账(未完成) --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java index a9dc887..e19d04a 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java @@ -1,9 +1,12 @@ package com.ruoyi.order.domain.vo; +import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo; +import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * @ClassName MgtTotalActivityTotalVo @@ -60,13 +63,15 @@ @ApiModelProperty(value = "订单金额value") private BigDecimal[] orderMoneyValue; - @ApiModelProperty(value = "商品类型数量key") - private String[] goodsTypeKey; + @ApiModelProperty(value = "商品类型数量") + private List<MgtMapIntTotalVo> goodsTypeTotalList; - @ApiModelProperty(value = "商品类型数量value") - private Integer[] goodsTypeTotalValue; + @ApiModelProperty(value = "商品类型金额") + private List<MgtMapBigTotalVo> goodsTypeMoneyList; - @ApiModelProperty(value = "商品类型金额value") - private BigDecimal[] goodsTypeMoneyValue; + @ApiModelProperty(value = "活动年龄分布key") + private String[] activityAgeKey; + @ApiModelProperty(value = "活动年龄分布value") + private Integer[] activityAgeValue; } -- Gitblit v1.7.1