From 85ccb0e999127b26bc6de7ea74552f216eaf0024 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 25 Sep 2021 18:15:03 +0800
Subject: [PATCH] 20210925
---
src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html | 14 +++---
src/main/resources/templates/febs/views/modules/order/orderDetail.html | 15 +++++++
src/main/resources/templates/febs/views/modules/order/refunding.html | 1
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 2 +
src/main/resources/templates/febs/views/modules/order/payMethodList.html | 18 ++++----
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 2
src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html | 4 ++
src/main/resources/templates/febs/views/modules/order/orderList.html | 42 +++++++++++++++-----
src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java | 6 ++-
9 files changed, 73 insertions(+), 31 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index e688cbb..79a08ee 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -71,7 +71,7 @@
if(parentId==null){
ViewMallMemberController.idFromMoneyFlow=0;
}
- mallMember.setId(ViewMallOrderController.idFromRefund);
+ mallMember.setId(ViewMallMemberController.idFromMoneyFlow);
Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember));
return new FebsResponse().success().data(dataTable);
}
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 0a402ce..782b3f8 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -29,6 +29,8 @@
private String payOrderNo;
+ private String payImage;
+
private String payResult;
/**
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
index 66c6915..8f39899 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
@@ -20,8 +20,6 @@
private String payMethod;
- private String payOrderNo;
-
private String payResult;
/**
@@ -64,4 +62,8 @@
private String orderItems;
+ private String payImage;
+
+ private String payOrderNo;
+
}
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
index 880ec15..440cc4a 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html
@@ -54,6 +54,10 @@
return '<span>订单支付</span>'
} else if (d.type === 4) {
return '<span>退款</span>'
+ }else if (d.type === 5) {
+ return '<span>转账</span>'
+ }else if (d.type === 6) {
+ return '<span>提现</span>'
}else{
return ''
}
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
index f3f9d86..3180f1c 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/paymentInfo.html
@@ -21,13 +21,13 @@
<form class="layui-form" action="" lay-filter="user-payment-info-form">
<div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">微信姓名：</label>
+ <label class="layui-form-label">微信姓名：</label>
<div class="layui-input-block">
<input type="text" name="wxName" class="layui-input" readonly>
</div>
</div>
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">微信账号：</label>
+ <label class="layui-form-label">微信账号：</label>
<div class="layui-input-block">
<input type="text" name="wxAccount" class="layui-input" readonly>
</div>
@@ -41,13 +41,13 @@
</div>
<div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">支付宝姓名：</label>
+ <label class="layui-form-label">支付宝姓名：</label>
<div class="layui-input-block">
<input type="text" name="aliName" class="layui-input" readonly>
</div>
</div>
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">支付宝账号：</label>
+ <label class="layui-form-label">支付宝账号：</label>
<div class="layui-input-block">
<input type="text" name="aliAccount" class="layui-input" readonly>
</div>
@@ -61,20 +61,20 @@
</div>
<div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">持卡人姓名：</label>
+ <label class="layui-form-label">持卡人姓名：</label>
<div class="layui-input-block">
<input type="text" name="bankName" class="layui-input" readonly>
</div>
</div>
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">开户行：</label>
+ <label class="layui-form-label">开户行：</label>
<div class="layui-input-block">
<input type="text" name="bank" class="layui-input" readonly>
</div>
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">银行卡号：</label>
+ <label class="layui-form-label">银行卡号：</label>
<div class="layui-input-block">
<input type="text" name="bankNo" class="layui-input" readonly>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/order/orderDetail.html b/src/main/resources/templates/febs/views/modules/order/orderDetail.html
index 749b692..ed013d2 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderDetail.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderDetail.html
@@ -46,6 +46,19 @@
autocomplete="off" class="layui-input" readonly>
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">支付订单号：</label>
+ <div class="layui-input-block">
+ <input type="text" name="payOrderNo"
+ autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">支付凭证：</label>
+ <div class="layui-input-block">
+ <img alt="支付凭证" data-th-src="${orderDetail.payImage}" style="width: 200px">
+ </div>
+ </div>
<div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
@@ -105,6 +118,8 @@
"orderItems": orderDetail.orderItems,
"expressNo": orderDetail.expressNo,
"expressCom": orderDetail.expressCom,
+ "payImage": orderDetail.payImage,
+ "payOrderNo": orderDetail.payOrderNo,
"address": orderDetail.address
});
}
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index d5ac1aa..b3601ab 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -54,6 +54,16 @@
</div>
</form>
<table lay-filter="orderTable" lay-data="{id: 'orderTable'}"></table>
+ <style type="text/css">
+ .layui-table-cell{
+ text-align:center;
+ height: auto;
+ white-space: normal;
+ }
+ .layui-table img{
+ max-width:200px
+ }
+ </style>
</div>
</div>
</div>
@@ -108,6 +118,22 @@
maxmin: true,
});
}
+
+ if (layEvent === 'seePayImage') {
+ var t = $view.find('#seePayImage'+data.id+'');
+ //页面层
+ layer.open({
+ type: 1,
+ title: "支付凭证",
+ skin: 'layui-layer-rim', //加上边框
+ area: ['80%', '80%'], //宽高
+ shadeClose: true, //开启遮罩关闭
+ end: function (index, layero) {
+ return false;
+ },
+ content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
+ });
+ }
});
// 查询按钮
@@ -139,6 +165,11 @@
{field: 'amount', title: '订单金额', minWidth: 150,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 150,align:'left'},
{field: 'payTime', title: '支付时间', minWidth: 150,align:'left'},
+ {field: 'payOrderNo', title: '支付订单号', minWidth: 150,align:'left'},
+ {field: 'payImage', title: '支付凭证',
+ templet: function (d) {
+ return '<a lay-event="seePayImage"><img id="seePayImage'+d.id+'" src="'+d.payImage+'" alt=""></a>';
+ }, minWidth: 300,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -159,17 +190,6 @@
return ''
}
}, minWidth: 80,align:'center'},
- // {field: 'accountStatus', title: '账号状态',
- // templet: function (d) {
- // if (d.accountStatus === 1) {
- // return '<span style="color:green;">正常</span>'
- // } else if (d.accountStatus === 2) {
- // return '<span style="color:red;">禁用</span>'
- // }else{
- // return ''
- // }
- // }, minWidth: 80,align:'center'},
- // {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
{title: '操作',
templet: function (d) {
if (d.status === 2) {
diff --git a/src/main/resources/templates/febs/views/modules/order/payMethodList.html b/src/main/resources/templates/febs/views/modules/order/payMethodList.html
index 707a24d..850e556 100644
--- a/src/main/resources/templates/febs/views/modules/order/payMethodList.html
+++ b/src/main/resources/templates/febs/views/modules/order/payMethodList.html
@@ -20,15 +20,15 @@
</form>
<table lay-filter="orderPaymethodTable" lay-data="{id: 'orderPaymethodTable'}"></table>
<style type="text/css">
- .layui-table-cell{
- text-align:center;
- height: auto;
- white-space: normal;
- }
- .layui-table img{
- max-width:200px
- }
- </style>
+ .layui-table-cell{
+ text-align:center;
+ height: auto;
+ white-space: normal;
+ }
+ .layui-table img{
+ max-width:200px
+ }
+ </style>
</div>
</div>
</div>
diff --git a/src/main/resources/templates/febs/views/modules/order/refunding.html b/src/main/resources/templates/febs/views/modules/order/refunding.html
index 2deb0a5..91c6a33 100644
--- a/src/main/resources/templates/febs/views/modules/order/refunding.html
+++ b/src/main/resources/templates/febs/views/modules/order/refunding.html
@@ -1,4 +1,3 @@
-
<div class="layui-fluid layui-anim febs-anim" id="febs-refunding-child" lay-title="退款进度">
<div class="layui-row febs-container">
<div class="layui-col-md12">
--
Gitblit v1.9.1