From 9f45f22b801c1d4f6780fb74ef3ad549106f10d9 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:48:12 +0800
Subject: [PATCH] refactor(mall): 优化订单相关功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 8 +++++++-
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 1 +
src/main/resources/templates/febs/views/modules/order/orderList.html | 10 ++++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
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 b6e6fa7..f4121ca 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
@@ -896,7 +896,13 @@
@Transactional(rollbackFor = Exception.class)
public void confirmOrder(Long id) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
+// MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
+ MallOrderInfo orderInfo = this.baseMapper.selectOne(
+ new LambdaQueryWrapper<MallOrderInfo>()
+ .eq(MallOrderInfo::getMemberId, member.getId())
+ .eq(MallOrderInfo::getId, id)
+ .last("limit 1")
+ );
if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
throw new FebsException("订单不存在");
}
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index c310823..539929e 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -127,6 +127,7 @@
<result column="take_code" property="takeCode" />
<result column="take_unique_code" property="takeUniqueCode" />
<result column="delivery_state" property="deliveryState" />
+ <result column="delivery_state" property="deliveryState" />
<result column="is_home" property="isHome" />
<result column="is_free" property="isFree" />
<result column="del_flag" property="delFlag" />
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 7e4e376..2216d97 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -504,6 +504,16 @@
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
+ {field: 'deliveryType', title: '提货方式',
+ templet: function (d) {
+ if (d.status === 1) {
+ return '<span style="color:blue;">自提</span>'
+ } else if (d.status === 2) {
+ return '<span style="color:green;">快递</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 100,align:'center'},
{field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
{field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
{field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
--
Gitblit v1.9.1