From c8d237747918de7618c9bbd3ad21f782cee168ab Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 06 一月 2022 16:32:00 +0800
Subject: [PATCH] 商业街代码提交
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
index 8b43506..c13eb04 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsOrderVO.java
@@ -1,9 +1,11 @@
package com.panzhihua.common.model.vos.community.microCommercialStreet;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
@Data
@ApiModel("商业街订单表")
@@ -14,7 +16,7 @@
* 订单编号
*/
@ApiModelProperty(value = "订单编号")
- private Long orderNo;
+ private String orderNo;
/**
* 支付配置id
@@ -38,12 +40,13 @@
* 支付金额
*/
@ApiModelProperty(value = "支付金额")
- private Double money;
+ private BigDecimal money;
/**
* 支付时间
*/
@ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
/**
@@ -56,7 +59,7 @@
* 支付流水号
*/
@ApiModelProperty(value = "支付流水号")
- private Long payNo;
+ private String payNo;
/**
* 用户id
@@ -78,5 +81,12 @@
*/
@ApiModelProperty("商家账号")
private String merchantAccount;
+ @ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+ @ApiModelProperty("交易类型 MWEB-->h5支付 NATIVE-->pc端支付 JSAPI-->小程序支付")
+ private String tradeType;
+ @ApiModelProperty("openid")
+ private String openId;
}
--
Gitblit v1.7.1