From 4f42aa109cddbe6699f599fc6e379ed26f930de1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Sep 2021 19:09:21 +0800
Subject: [PATCH] fix some problem
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 4 ++++
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 6 +++---
2 files changed, 7 insertions(+), 3 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 7349633..5ccdcba 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
@@ -98,6 +98,8 @@
orderItem.setGoodsName(sku.getGoodsName());
orderItem.setSkuId(sku.getId());
orderItem.setStyleName(sku.getStyleName());
+ orderItem.setSkuName(sku.getSkuName());
+ orderItem.setSkuImage(sku.getSkuImage());
total = total.add(amount);
mallOrderItemMapper.insert(orderItem);
@@ -106,6 +108,8 @@
mallGoodsSkuMapper.updateById(sku);
}
+ orderInfo.setAmount(total);
+ this.baseMapper.updateById(orderInfo);
return orderInfo.getId();
}
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 86db645..e3d62ce 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -89,10 +89,10 @@
<if test="record.query != null and record.query != ''">
and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
</if>
- <if test="record.status == 4">
+ <if test="record.status == 4 and record.status != 0">
and a.status in (5,6)
</if>
- <if test="record.status != 4">
+ <if test="record.status != 4 and record.status != 0">
and a.status = #{record.status}
</if>
</where>
@@ -115,7 +115,7 @@
b.amount
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
- where id=#{id}
+ where a.id=#{id}
</select>
<select id="selectMemberOrderStatusCnt" resultType="java.util.Map">
--
Gitblit v1.9.1