From faaa3ad2b937fdd17cd36b1523e07fddf1346db2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 22:53:50 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index bf6af19..be202c1 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -14,6 +14,13 @@
<result property="originalPrice" column="original_price" />
<result property="presentPrice" column="present_price" />
<result property="categoryId" column="category_id" />
+ <result property="volume" column="volume" />
+ <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" />
+ <result property="isNormal" column="is_normal" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -22,7 +29,7 @@
<id property="id" column="sku_id" />
<result property="skuName" column="sku_name" />
<result property="skuImage" column="sku_image" />
- <result property="stock" column="stock" />
+ <result property="stock" column="sku_stock" />
<result property="skuVolume" column="sku_volume" />
<result property="originalPrice" column="sku_original_price" />
<result property="presentPrice" column="sku_present_price" />
@@ -41,15 +48,15 @@
c.id sku_id,
c.sku_name,
c.sku_image,
- c.stock,
+ c.stock sku_stock,
c.sku_volume,
c.original_price sku_original_price,
c.present_price sku_present_price,
c.style_id sku_style_id,
c.goods_id sku_goods_id
from mall_goods a
- inner join mall_goods_style b on a.id = b.goods_id
- inner join mall_goods_sku c on b.id=c.style_id
+ left join mall_goods_style b on a.id = b.goods_id
+ left join mall_goods_sku c on b.id=c.style_id
where a.id=#{id}
</select>
@@ -62,12 +69,13 @@
a.thumb,
a.original_price,
a.present_price,
+ a.score,
a.is_hot,
min(b.present_price) price,
sum(b.sku_volume) saleVolume
from mall_goods a
- inner join mall_goods_sku b on a.id=b.goods_id
- inner join mall_goods_category c on a.category_id=c.id
+ left join mall_goods_sku b on a.id=b.goods_id
+ left join mall_goods_category c on a.category_id=c.id
<where>
a.is_sale=1
<if test="record != null">
@@ -77,8 +85,11 @@
<if test="record.isNormal != null and record.isNormal != ''">
and a.is_normal = #{record.isNormal}
</if>
- <if test="record.goodsType != null and record.goodsType != ''">
- and a.goods_type = #{record.goodsType}
+ <if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
+ and a.goods_type = #{record.goodsType} and a.present_price != 0
+ </if>
+ <if test="record.goodsType == 3">
+ and a.present_price = 0
</if>
<if test="record.categoryId != null and record.categoryId != ''">
and (c.id = #{record.categoryId} or c.parent_id=#{record.categoryId})
@@ -124,6 +135,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
@@ -188,4 +200,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