From 5932ee98f530f93c93c759b8947f95e366e32894 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 05 八月 2023 18:15:42 +0800
Subject: [PATCH] 1、定时任务 商户进件状态查询 2、小程序下单统一支付提交 3、订单核销分账 4、订单退款 5、支付、退款回调 6、分账回调
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java
index 99a56ab..2668b19 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java
@@ -1,11 +1,9 @@
package com.ruoyi.system.api.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
/**
* @author jqs34
@@ -29,7 +27,7 @@
@ApiModelProperty(value = "待处理订单")
private Integer unHandleOrder;
- @ApiModelProperty(value = "跟进任务")
+ @ApiModelProperty(value = "会员跟进任务")
private Integer task;
@ApiModelProperty(value = "店铺营业额")
@@ -41,7 +39,10 @@
@ApiModelProperty(value = "剩余体验人数")
private Integer explorationSurp;
- @ApiModelProperty(value = "多个商户id")
- private List<Long> shopIds;
+ @ApiModelProperty(value = "领券1开2关")
+ private Integer platformCouponFlag;
+
+ @ApiModelProperty(value = "生日卡1开2关")
+ private Integer platformBirthdayFlag;
}
--
Gitblit v1.7.1