From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
index 6a6a956..d86fa6f 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
@@ -1,6 +1,11 @@
 package com.ruoyi.member.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author jqs34
@@ -11,4 +16,52 @@
  */
 @Data
 public class MerMemberInfoVo {
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String nickName;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phonenumber;
+
+    @ApiModelProperty("用户头像")
+    private String avatar;
+
+    @ApiModelProperty("用户生日")
+    private String birthday;
+
+    @ApiModelProperty(value = "用户类型")
+    private String memberType;
+
+    @ApiModelProperty(value = "用户标签")
+    private String userTags;
+
+    @ApiModelProperty(value = "次数剩余")
+    private Integer surpNumber;
+
+    @ApiModelProperty(value = "消费次数")
+    private Integer userNumber;
+
+    @ApiModelProperty(value = "消费总额")
+    private BigDecimal payMoney;
+
+    @ApiModelProperty(value = "待支付金额")
+    private BigDecimal unpaidMoney;
+
+    @ApiModelProperty(value = "最近跟进任务")
+    private String lastTaskContent;
+
+    @ApiModelProperty(value = "最近跟进任务时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lastTaskTime;
+
+    @ApiModelProperty(value = "下次跟进任务时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date nextTaskTime;
+
+    @ApiModelProperty(value = "最近消费时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lastPayTime;
 }

--
Gitblit v1.7.1