From 96e622e737ec7d0b9f3a64ecc4e4a53389a207a2 Mon Sep 17 00:00:00 2001
From: JiangYouYao <ak473600000>
Date: Fri, 18 Mar 2022 17:00:09 +0800
Subject: [PATCH] 重构：订单取消逻辑
---
zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
index 8bb8780..55d7d89 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
@@ -1,5 +1,7 @@
package com.matrix.system.hive.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.io.Serializable;
import java.util.Date;
/**
@@ -8,9 +10,12 @@
*/
public class MoneyCardUseFlow implements Serializable{
+ //jyytodo 改成枚举
public static final String USE_TYPE_CONSUMER = "消费扣款";
public static final String USE_TYPE_ORDRE_CANCEL = "取消订单";
+
+ public static final String USE_TYPE_ORDRE_TK = "订单退款";
public static final String USE_TYPE_CZ = "会员充值";
@@ -27,7 +32,12 @@
* 订单编号
*/
private String orderNo;
-
+
+ /**
+ * 微信支付编号
+ */
+ private String payNo;
+
/**
* 操作员id
@@ -43,6 +53,7 @@
/**
* 创建时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
/**
@@ -235,4 +246,12 @@
public void setTimes(Integer times) {
this.times = times;
}
+
+ public String getPayNo() {
+ return payNo;
+ }
+
+ public void setPayNo(String payNo) {
+ this.payNo = payNo;
+ }
}
--
Gitblit v1.9.1