From f1bade14d21b7162ee05245905206192f1afa7c3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Sep 2022 15:07:20 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 24 ++++++++++++------------
src/main/java/cc/mrbird/febs/mall/dto/MallOrderInfoDto.java | 2 ++
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 11 ++++++++---
src/main/resources/templates/febs/views/modules/order/orderList.html | 10 ++++++++--
4 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallOrderInfoDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallOrderInfoDto.java
index 12aaad0..0dbafff 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallOrderInfoDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallOrderInfoDto.java
@@ -28,4 +28,6 @@
private String startTime;
private String endTime;
+
+ private String goodsName;
}
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 fc0fa9e..d7d431d 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
@@ -66,18 +66,18 @@
public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo);
- List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
- if(CollUtil.isNotEmpty(records)){
- for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
- Long id = adminMallOrderInfoVo.getId();
- List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
- StringBuffer stringBuffer = new StringBuffer();
- for(MallOrderItem mallOrderItem : mallOrderItemList){
- stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
- }
- adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
- }
- }
+// List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
+// if(CollUtil.isNotEmpty(records)){
+// for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
+// Long id = adminMallOrderInfoVo.getId();
+// List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
+// StringBuffer stringBuffer = new StringBuffer();
+// for(MallOrderItem mallOrderItem : mallOrderItemList){
+// stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
+// }
+// adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
+// }
+// }
return adminMallOrderInfoVos;
}
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 95e7910..8e07beb 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -44,14 +44,19 @@
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
- select *,
+ select a.*,
b.name memberName,
b.bind_phone memberBindPhone,
- b.phone memberPhone
- from mall_order_info a
+ b.phone memberPhone,
+ c.goods_name
+ from mall_order_item c
+ left join mall_order_info a on a.id = c.order_id
left join mall_member b on a.member_id = b.id
<where>
<if test="record != null">
+ <if test="record.goodsName != null and record.goodsName != ''">
+ and c.goods_name like CONCAT('%', CONCAT(#{record.goodsName}, '%'))
+ </if>
<if test="record.payResult != null and record.payResult != ''">
and a.pay_result = #{record.payResult}
</if>
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 8ce3f77..b9f7828 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -13,6 +13,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
</div>
</div>
@@ -240,11 +245,11 @@
toolbar: '#tableToolBar',
totalRow: true ,// 开启合计行
cols: [[
- {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left', totalRowText: '合计：'},
+ {field: 'orderNo', title: '订单编号', minWidth: 120,align:'left', totalRowText: '合计：'},
{field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
{field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
{field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
- {field: 'goodsName', title: '商品信息', minWidth: 120,align:'left'},
+ {field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
{field: 'carriage', title: '运费', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
@@ -301,6 +306,7 @@
endTime: $searchForm.find('input[name="endTime"]').val().trim(),
name: $searchForm.find('input[name="name"]').val().trim(),
orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
+ goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
payResult: $searchForm.find("select[name='payResult']").val(),
status: $searchForm.find("select[name='status']").val(),
};
--
Gitblit v1.9.1