From b62edba94cc796bf3aecc893ae3a290a02317e14 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 28 May 2022 20:09:46 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index afd7b80..e332809 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -18,6 +18,8 @@
<result property="stock" column="stock" />
<result property="score" column="score" />
<result property="goodsType" column="goods_type" />
+ <result property="hasCarriage" column="has_carriage" />
+ <result property="carriage" column="carriage" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -129,6 +131,7 @@
a.present_price,
a.is_hot,
a.score,
+ a.is_normal,
b.name categaryName,
IFNULL(sum(c.sku_volume), a.volume) skuVolume,
IFNULL(sum(c.stock), a.stock) stock
@@ -193,4 +196,17 @@
a.goods_name goodsName
from mall_goods a
</select>
+
+ <select id="selectOrderGoodsList" resultType="cc.mrbird.febs.mall.entity.MallGoods">
+ select a.*,c.order_no from mall_goods a
+ inner join mall_order_item b on a.id=b.goods_id
+ inner join mall_order_info c on b.order_id=c.ID
+ where c.status=4
+ <if test="memberId != null">
+ and c.member_id=#{memberId}
+ </if>
+ <if test="date != null">
+ and date_format(c.receving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ </if>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1