From 73b3813c2d110bf446f251350f120bb1e2b51d0c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 10:45:14 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/resources/mapper/modules/MallGoodsMapper.xml |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 66ce2c7..1acc218 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -22,6 +22,8 @@
         <result property="hasCarriage" column="has_carriage" />
         <result property="carriage" column="carriage" />
         <result property="isNormal" column="is_normal" />
+        <result property="subsidyAmount" column="subsidy_amount" />
+        <result property="starRating" column="star_rating" />
         <collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
             <id property="id" column="style_id" />
             <result property="name" column="style_name" />
@@ -70,6 +72,8 @@
                 a.thumb,
                 a.original_price,
                 a.present_price,
+                a.subsidy_amount,
+                a.star_rating,
                 a.score,
                 a.is_hot,
                 min(b.present_price) price,
@@ -91,6 +95,18 @@
                     </if>
                     <if test="record.goodsType == 3">
                         and a.present_price = 0
+                    </if>
+                    <if test="record.starRating == 1">
+                        and a.star_rating = '普通'
+                    </if>
+                    <if test="record.starRating == 2">
+                        and a.star_rating = '一星'
+                    </if>
+                    <if test="record.starRating == 3">
+                        and a.star_rating = '二星'
+                    </if>
+                    <if test="record.starRating == 4">
+                        and a.star_rating = '三星'
                     </if>
                     <if test="record.categoryId != null and record.categoryId != ''">
                         and (c.id = #{record.categoryId} or c.parent_id=#{record.categoryId})
@@ -137,6 +153,8 @@
         a.is_hot,
         a.score,
         a.is_normal,
+        a.subsidy_amount,
+        a.star_rating,
         b.name categaryName,
         IFNULL(sum(c.sku_volume), a.volume) skuVolume,
         IFNULL(sum(c.stock), a.stock) stock

--
Gitblit v1.9.1