From 264980073d03ead5cfce39f87c611de623db4d3f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 15:00:23 +0800
Subject: [PATCH] 20210525 申诉单
---
src/main/resources/templates/febs/views/modules/otc/otcAppealInfo.html | 4 ++--
src/main/resources/mapper/modules/OtcOrderAppealMapper.xml | 1 +
src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java | 5 +++++
src/main/resources/templates/febs/views/modules/otc/otcAppealList.html | 6 +++---
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java
index 5b245d8..69edb1f 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java
@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.otc.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -32,9 +33,13 @@
public static final Integer STATUS_FOUR = 4;
//付款时间
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
//完成时间
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date finishTime;
diff --git a/src/main/resources/mapper/modules/OtcOrderAppealMapper.xml b/src/main/resources/mapper/modules/OtcOrderAppealMapper.xml
index 42b9e69..53c6158 100644
--- a/src/main/resources/mapper/modules/OtcOrderAppealMapper.xml
+++ b/src/main/resources/mapper/modules/OtcOrderAppealMapper.xml
@@ -10,6 +10,7 @@
otc_order_appeal a
LEFT JOIN member m ON m.id = a.member_id
LEFT JOIN member_authentication b ON b.member_id = a.member_id
+ LEFT JOIN otc_order c ON c.id = a.order_id
<where>
<if test="record != null" >
<if test="record.account!=null and record.account!=''">
diff --git a/src/main/resources/templates/febs/views/modules/otc/otcAppealInfo.html b/src/main/resources/templates/febs/views/modules/otc/otcAppealInfo.html
index 704bef8..7d9db4c 100644
--- a/src/main/resources/templates/febs/views/modules/otc/otcAppealInfo.html
+++ b/src/main/resources/templates/febs/views/modules/otc/otcAppealInfo.html
@@ -65,14 +65,14 @@
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">付款时间：</label>
<div class="layui-input-block">
- <input type="date" name="payTime"data-th-id="${member.payTime}"
+ <input type="text" name="payTime"data-th-id="${member.payTime}"
autocomplete="off" class="layui-input" readonly>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">完成时间：</label>
<div class="layui-input-block">
- <input type="date" name="finishTime"data-th-id="${member.finishTime}"
+ <input type="text" name="finishTime"data-th-id="${member.finishTime}"
autocomplete="off" class="layui-input" readonly>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html b/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html
index c523299..02b4fc9 100644
--- a/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html
+++ b/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html
@@ -74,9 +74,9 @@
var data = obj.data,
layEvent = obj.event;
if (layEvent === 'dealIng') {
- febs.modal.confirm('处理', '开始处理申诉？', function () {
- dealIng(data.id);
- });
+ // febs.modal.confirm('处理', '开始处理申诉？', function () {
+ // dealIng(data.id);
+ // });
febs.modal.open( '详情', 'modules/otc/otcAppealInfo/' + data.id, {
maxmin: true,
});
--
Gitblit v1.9.1