From c0cae0a68ec2d917a9fad1f093a16b6d1d16af3c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Mar 2023 13:41:37 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 46d4717..a9d9f25 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -25,7 +25,7 @@
<result property="carriageType" column="carriage_type" />
<result property="carriageAmount" column="carriage_amount" />
<result property="carriageRuleId" column="carriage_rule_id" />
-<!-- <result property="goodsWeight" column="goods_weight" />-->
+ <result property="goodsWeight" column="goods_weight" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -40,7 +40,8 @@
<result property="presentPrice" column="sku_present_price" />
<result property="styleId" column="sku_style_id"/>
<result property="goodsId" column="sku_goods_id" />
- <result property="goodsWeight" column="goods_weight" />
+ <result property="skuGoodsWeight" column="sku_goods_weight" />
+ <result property="sample" column="sample" />
</collection>
</collection>
</resultMap>
@@ -59,7 +60,8 @@
c.original_price sku_original_price,
c.present_price sku_present_price,
c.style_id sku_style_id,
- c.goods_weight goodsWeight,
+ c.goods_weight sku_goods_weight,
+ c.sample sample,
c.goods_id sku_goods_id
from mall_goods a
left join mall_goods_style b on a.id = b.goods_id
@@ -74,6 +76,7 @@
a.goods_name,
a.goods_introdution goodsIntroduction,
a.thumb,
+ a.unit,
a.original_price,
a.present_price,
a.score,
@@ -82,6 +85,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,
@@ -113,11 +117,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
@@ -307,6 +314,7 @@
a.goods_name,
a.goods_introdution goodsIntroduction,
a.thumb,
+ a.unit,
a.original_price,
a.present_price,
a.score,
@@ -315,6 +323,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,
@@ -346,11 +355,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