Browse Source

联合丽格1.0.2

huangzhiguo 1 year ago
parent
commit
85bfcc6e93

+ 6 - 6
src/main/resources/mapper/MallOrganizeMapper.xml

@@ -48,13 +48,13 @@
     </select>
     </select>
     <select id="getFloorProducts" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
     <select id="getFloorProducts" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
         SELECT
         SELECT
-        cmfp.floorId,
+        DISTINCT cmfp.floorId,
         p.productID AS productId,
         p.productID AS productId,
-        (select price from cm_sku where productID=p.productID and organizeId = 4 order by price asc limit 1) as price,
+        s.price as price,
         s.normalPrice,
         s.normalPrice,
         s.costPrice,
         s.costPrice,
         s.ladderPriceFlag,
         s.ladderPriceFlag,
-        (select minBuyNumber from cm_sku where productID=p.productID and organizeId = 4 order by price asc limit 1) as minBuyNumber,
+        s.minBuyNumber as minBuyNumber,
         IFNULL((SELECT validFlag FROM cm_organize_product_info  WHERE productId = p.productID AND organizeId =4), 999) AS validFlag,
         IFNULL((SELECT validFlag FROM cm_organize_product_info  WHERE productId = p.productID AND organizeId =4), 999) AS validFlag,
         p.name,
         p.name,
         p.mainImage
         p.mainImage
@@ -211,13 +211,13 @@
     </select>
     </select>
     <select id="getOrganizeProducts" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
     <select id="getOrganizeProducts" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
         SELECT
         SELECT
-            cmfp.floorId,
+            DISTINCT cmfp.floorId,
             p.productID AS productId,
             p.productID AS productId,
             s.normalPrice,
             s.normalPrice,
             s.costPrice,
             s.costPrice,
             s.ladderPriceFlag,
             s.ladderPriceFlag,
-            (SELECT price FROM cm_sku WHERE productID=p.productID and organizeId = 4 ORDER BY price ASC LIMIT 1) AS price,
-            (select minBuyNumber from cm_sku where productID=p.productID and organizeId = 4 order by price asc limit 1) as minBuyNumber,
+            s.price AS price,
+            s.minBuyNumber as minBuyNumber,
             IFNULL((SELECT validFlag FROM cm_organize_product_info  WHERE productId = p.productID AND organizeId = 4), 999) AS validFlag,
             IFNULL((SELECT validFlag FROM cm_organize_product_info  WHERE productId = p.productID AND organizeId = 4), 999) AS validFlag,
             p.name,
             p.name,
             p.mainImage
             p.mainImage

+ 1 - 2
src/main/resources/mapper/ShopMapper.xml

@@ -241,7 +241,6 @@
             invoiceType = #{invoiceType},
             invoiceType = #{invoiceType},
         </if>
         </if>
         updateTime = #{updateTime},
         updateTime = #{updateTime},
-        # validFlag = #{validFlag},
         showFlag=#{showFlag}
         showFlag=#{showFlag}
         where productID = #{productId}
         where productID = #{productId}
     </update>
     </update>
@@ -466,7 +465,7 @@
             <if test="productCode != null and productCode != ''">
             <if test="productCode != null and productCode != ''">
                 and p.productCode = #{productCode}
                 and p.productCode = #{productCode}
             </if>
             </if>
-            <if test="validFlag != null and validFlag != ''">
+            <if test="validFlag != null">
                 and copi.validFlag = #{validFlag}
                 and copi.validFlag = #{validFlag}
             </if>
             </if>
             <if test="featuredFlag != null and featuredFlag != ''">
             <if test="featuredFlag != null and featuredFlag != ''">