From 0ef2ea54b85d11f537a761e2028a40ec1ec1df1b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 15:55:31 +0800
Subject: [PATCH] 订单发货设置
---
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 4 +++-
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 1 +
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 4 ++--
src/main/resources/templates/febs/views/modules/order/orderList.html | 18 +++++-------------
4 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 03897f1..ae86f42 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -279,7 +279,7 @@
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
// String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
- String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品名称", "订单状态", "物流单号", "物流公司", "物流公司码"};
+ String[] header = {"订单编号", "订单金额", "下单时间", "配送方式", "收货姓名", "收货电话", "收货地址", "商品详情", "物流单号", "物流公司", "物流公司码"};
orderSheet.setHeaders(header);
QueryRequest request = new QueryRequest();
@@ -322,7 +322,7 @@
temp.add("");
}
- temp.add(item.getStatus());
+// temp.add(item.getStatus());
list.add(temp);
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 13b7ae5..49bd7a1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -71,6 +71,7 @@
if(CollUtil.isNotEmpty(adminMallOrderInfoVos.getRecords())){
for(AdminMallOrderInfoVo adminMallOrderInfoVo : adminMallOrderInfoVos.getRecords()){
Long orderId = adminMallOrderInfoVo.getId();
+ adminMallOrderInfoVo.setGoodsAmount(adminMallOrderInfoVo.getAmount().subtract(adminMallOrderInfoVo.getCarriage()));
List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderId);
if(CollUtil.isNotEmpty(mallOrderItemList)){
StringBuffer stringBuffer = new StringBuffer();
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 78ef1f8..951dc9c 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -70,7 +70,9 @@
private String memberEmail;
- private Integer carriage;
+ private BigDecimal carriage;
+
+ private BigDecimal goodsAmount;
//配送方式 1：自提 2：快递
private Integer deliveryType;
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 8027cb1..b75c886 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -300,6 +300,8 @@
,accept: 'file' //普通文件
,done: function(res){
console.log("123");
+ febs.alert.success('操作成功');
+ $query.click();
}
});
@@ -381,21 +383,11 @@
{field: 'orderNo', title: '订单编号', minWidth: 200,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: 160,align:'left'},
- {field: 'amount', title: '订单金额', minWidth: 160,align:'left'},
- // {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
+ {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
+ {field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
+ {field: 'amount', title: '总金额', minWidth: 100,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
- // {field: 'isHome', title: '配送方式',
- // templet: function (d) {
- // if (d.isHome === 2) {
- // return '<span style="color:dodgerblue;">自提</span>'
- // } else if (d.isHome === 1) {
- // return '<span style="color:forestgreen;">送货上门</span>'
- // }else{
- // return ''
- // }
- // }, minWidth: 100,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
--
Gitblit v1.9.1