From 84c7afc62bb1eb6f5d80d2d9928d0d11a1ffbdda Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Aug 2023 21:14:13 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 5162606..93d6ead 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -26,6 +26,10 @@
<result property="carriageAmount" column="carriage_amount" />
<result property="carriageRuleId" column="carriage_rule_id" />
<result property="goodsWeight" column="goods_weight" />
+ <result property="levelOnePrice" column="level_one_price" />
+ <result property="levelTwoPrice" column="level_two_price" />
+ <result property="levelThreePrice" column="level_three_price" />
+ <result property="isUnreal" column="is_unreal" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -40,6 +44,11 @@
<result property="presentPrice" column="sku_present_price" />
<result property="styleId" column="sku_style_id"/>
<result property="goodsId" column="sku_goods_id" />
+ <result property="skuGoodsWeight" column="sku_goods_weight" />
+ <result property="sample" column="sample" />
+ <result property="levelOnePrice" column="sku_level_one_price" />
+ <result property="levelTwoPrice" column="sku_level_two_price" />
+ <result property="levelThreePrice" column="sku_level_three_price" />
</collection>
</collection>
</resultMap>
@@ -58,6 +67,11 @@
c.original_price sku_original_price,
c.present_price sku_present_price,
c.style_id sku_style_id,
+ c.goods_weight sku_goods_weight,
+ c.sample sample,
+ c.level_one_price sku_level_one_price,
+ c.level_two_price sku_level_two_price,
+ c.level_three_price sku_level_three_price,
c.goods_id sku_goods_id
from mall_goods a
left join mall_goods_style b on a.id = b.goods_id
@@ -72,14 +86,19 @@
a.goods_name,
a.goods_introdution goodsIntroduction,
a.thumb,
+ a.unit,
a.original_price,
a.present_price,
+ a.level_one_price,
+ a.level_two_price,
+ a.level_three_price,
a.score,
a.is_hot,
a.carriage_type,
a.carriage_amount,
a.carriage_rule_id,
a.goods_weight,
+ a.order_number,
min(b.id) skuId,
min(b.present_price) price,
sum(b.stock) stock,
@@ -111,11 +130,14 @@
</if>
</where>
group by a.id
- order by a.id desc
+ order by a.order_number ASC
) a
<if test="record.sortType != null">
+<!-- <if test="record.sortType == 1">-->
+<!-- order by a.is_hot, a.saleVolume desc, a.id-->
+<!-- </if>-->
<if test="record.sortType == 1">
- order by a.is_hot, a.saleVolume desc, a.id
+ order by a.order_number ASC
</if>
<if test="record.sortType == 2">
order by a.saleVolume desc
@@ -305,6 +327,7 @@
a.goods_name,
a.goods_introdution goodsIntroduction,
a.thumb,
+ a.unit,
a.original_price,
a.present_price,
a.score,
@@ -313,6 +336,7 @@
a.carriage_amount,
a.carriage_rule_id,
a.goods_weight,
+ a.order_number,
min(b.id) skuId,
min(b.present_price) price,
sum(b.stock) stock,
@@ -344,11 +368,14 @@
</if>
</where>
group by a.id
- order by a.id desc
+ order by a.order_number ASC
) a
<if test="record.sortType != null">
+<!-- <if test="record.sortType == 1">-->
+<!-- order by a.is_hot, a.saleVolume desc, a.id-->
+<!-- </if>-->
<if test="record.sortType == 1">
- order by a.is_hot, a.saleVolume desc, a.id
+ order by a.order_number ASC
</if>
<if test="record.sortType == 2">
order by a.saleVolume desc
--
Gitblit v1.9.1