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 |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 80a097b..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 = "会员充值";
 
@@ -48,6 +53,7 @@
 	/**
 	 * 创建时间
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
 	private Date  createTime;
 	
 	/**

--
Gitblit v1.9.1