From 5274e48fdb951e007b3ffdb1e4a9fcfe84b7c72c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 29 Sep 2022 17:57:08 +0800
Subject: [PATCH] 20220902
---
src/main/resources/templates/febs/views/modules/order/orderDetail.html | 23 ++++++++++++++++-------
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 4 +++-
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 1 +
src/main/resources/templates/febs/views/modules/order/orderList.html | 16 ++++++++--------
src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java | 2 ++
6 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index cb4a69a..cef66a2 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -50,6 +50,7 @@
private String phone;
+ private Long addressId;
private String address;
private String longitude;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 2c4106a..0cf01ac 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -226,7 +226,7 @@
orderInfo.setCarriage(delivaryAmount);
}
orderInfo.setAmount(total);
-
+ orderInfo.setAddressId(address.getId());
orderInfo.setName(address.getName());
orderInfo.setPhone(address.getPhone());
orderInfo.setIsHome(addOrderDto.getIsHome());
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 8f39899..059b04b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminOrderDetailVo.java
@@ -39,6 +39,8 @@
private String phone;
private String address;
+ private String addressArea;
+ private String addressInfo;
private String longitude;
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 9657848..c4e2735 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -247,7 +247,9 @@
</select>
<select id="getMallOrderDetailById" resultType="cc.mrbird.febs.mall.vo.AdminOrderDetailVo">
- select * from mall_order_info a where a.id = #{id}
+ select a.*,b.area addressArea,b.address addressInfo from mall_order_info a
+ left join mall_address_info b on a.address_id = b.id
+ where a.id = #{id}
</select>
<select id="getMallOrderItemByOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
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 0348849..06cab11 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderDetail.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderDetail.html
@@ -39,13 +39,20 @@
</div>
</div>
</div>
-<!-- <div class="layui-form-item">-->
-<!-- <label class="layui-form-label">地址：</label>-->
-<!-- <div class="layui-input-block">-->
-<!-- <input type="text" name="address"-->
-<!-- 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="addressArea"
+ 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="addressInfo"
+ autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">支付订单号：</label>-->
<!-- <div class="layui-input-block">-->
@@ -116,6 +123,8 @@
"phone": orderDetail.phone,
"amount": orderDetail.amount,
"orderItems": orderDetail.orderItems,
+ "addressArea": orderDetail.addressArea,
+ "addressInfo": orderDetail.addressInfo,
// "expressNo": orderDetail.expressNo,
// "expressCom": orderDetail.expressCom,
// "payImage": orderDetail.payImage,
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 4f0bb5b..abc1f28 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -324,11 +324,11 @@
cols: [[
{type: 'checkbox', fixed: 'left'},
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
- {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
+ {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
// {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
- {field: 'goodsName', title: '商品', minWidth: 120,align:'left'},
- {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
+ {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
+ {field: 'amount', title: '订单金额', minWidth: 80,align:'left'},
{field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
{field: 'isHome', title: '配送方式',
@@ -340,7 +340,7 @@
}else{
return ''
}
- }, minWidth: 120,align:'center'},
+ }, minWidth: 100,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -372,10 +372,10 @@
}else{
return ''
}
- }, minWidth: 120,align:'center'},
- {field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
- {field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
- {field: 'wxOrderNo', title: '支付订单号', minWidth: 200,align:'left'},
+ }, minWidth: 80,align:'center'},
+ {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
+ {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
+ {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
{title: '操作',
templet: function (d) {
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
--
Gitblit v1.9.1