From f922fc5f52e4ed41ef523de02c9d257345d385e3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Jul 2023 14:48:31 +0800
Subject: [PATCH] 支付返利，微信余额支付会有返利。发卷，赠送积分逻辑
---
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
index e3e6e31..951dc9c 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -16,8 +17,10 @@
private Long memberId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date orderTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
private BigDecimal amount;
@@ -25,6 +28,8 @@
private String payMethod;
private String payOrderNo;
+
+ private String payImage;
private String payResult;
@@ -61,5 +66,23 @@
private String memberPhone;
+ private String memberBindPhone;
+
private String memberEmail;
+
+ private BigDecimal carriage;
+
+ private BigDecimal goodsAmount;
+ //配送方式 1：自提 2：快递
+ private Integer deliveryType;
+
+ private String wxOrderNo;
+ //配送状态 1：待配送 2：配送中 3：已送达
+ private Integer deliveryState;
+ //是否送货上门 1：是 2：否
+ private Integer isHome;
+ //团长姓名
+ private String leaderName;
+ //商品名称
+ private String goodsName;
}
--
Gitblit v1.9.1