From d867207d4bf46378718927444c7cef404b4a6a03 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 15:19:50 +0800
Subject: [PATCH] 20210924
---
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 3 +++
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 2 +-
src/main/resources/templates/febs/views/modules/order/orderList.html | 7 ++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
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 e3e6e31..0a402ce 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -16,8 +17,10 @@
private Long memberId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date orderTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
private BigDecimal amount;
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 85d9104..6128a0c 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -7,7 +7,7 @@
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
- select *
+ select *,b.name memberName,b.phone memberPhone
from mall_order_info a
left join mall_member b on a.member_id = b.id
<where>
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 2a62c2a..d5ac1aa 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -133,7 +133,12 @@
id: 'orderTable',
url: ctx + 'admin/order/orderList',
cols: [[
- {field: 'orderNo', title: '商品名称', minWidth: 150,align:'left'},
+ {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
+ {field: 'memberName', title: '购买人', minWidth: 150,align:'left'},
+ {field: 'memberPhone', title: '联系方式', minWidth: 150,align:'left'},
+ {field: 'amount', title: '订单金额', minWidth: 150,align:'left'},
+ {field: 'orderTime', title: '下单时间', minWidth: 150,align:'left'},
+ {field: 'payTime', title: '支付时间', minWidth: 150,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
--
Gitblit v1.9.1