联合丽格

src/main/java/com/caimei365/commodity/mapper/MallOrganizeMapper.java

@@ -88,10 +88,10 @@ public interface MallOrganizeMapper {
     MallActiveVo getActiveById(@Param("organizeId") Integer organizeId, @Param("activeId") Integer activeId);
     /**
      * 活动商品列表
-     * @param imageId
+     * @param activeId
      * @return
      */
-    List<MallOrganizeProductVo> getActiveProduct(@Param("imageId") Integer imageId);
+    List<MallOrganizeProductVo> getActiveProduct(@Param("activeId") Integer activeId);
     /**
      * 获取活动宣传图
      * @param activeId

src/main/resources/mapper/MallOrganizeMapper.xml

@@ -11,6 +11,7 @@
                 AND organizeId = #{organizeId}
             </if>
         </where>
+        ORDER BY sort
     </select>
     <select id="getMallBannerImages" resultType="com.caimei365.commodity.model.vo.MallImageLinkVo">
         SELECT id, organizeID as organizeId, bannerName, bannerImage, sort, jumpType, jumpProductId, jumpActiveId
@@ -21,6 +22,7 @@
                 AND organizeID = #{organizeId}
             </if>
         </where>
+        ORDER BY sort
     </select>
     <select id="getmallTheme" resultType="com.caimei365.commodity.model.vo.MallThemeVo">
         SELECT id, organizeId, topic, image, enabledStatus, jumpType, jumpProductId, jumpActiveId
@@ -42,6 +44,7 @@
                 AND organizeId = #{organizeId}
             </if>
         </where>
+        ORDER BY sort
     </select>
     <select id="getFloorProducts" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
         SELECT
@@ -140,6 +143,7 @@
     </select>
     <select id="getActiveProduct" resultType="com.caimei365.commodity.model.vo.MallOrganizeProductVo">
         SELECT
+            cmop.id,
             cmap.imageId AS imageId,
             cmop.productID AS productId,
             cmop.normalPrice,
@@ -151,10 +155,10 @@
             cmop.validFlag,
             p.name,
             p.mainImage
-        FROM cm_mall_active_product cmap
-                 LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cmap.productId
-                 LEFT JOIN product p ON cmop.productId = p.productId
-        WHERE cmap.activeId = 1
+        FROM  cm_mall_organize_products cmop
+                  LEFT JOIN product p ON cmop.productId = p.productId
+                  LEFT JOIN cm_mall_active_product cmap ON cmop.id = cmap.productId
+        WHERE cmap.activeId = #{activeId}
     </select>
     <select id="getActiveImageById" resultType="com.caimei365.commodity.model.vo.MallActiveImageVo">
         select id, activeId, topic, image

src/main/resources/mapper/PageMapper.xml

@@ -367,7 +367,7 @@
         from product p
             left join cm_mall_organize_products cmop on p.productId = cmop.productId
                  left join shop s on s.shopId = p.shopId
-        where p.productID = #{productId} or cmop.id = #{productId}
+        where (p.productID = #{productId} OR cmop.id = #{productId}) AND cmop.delFlag = 0
     </select>
     <select id="getBuyAgainProducts" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select p.productID                 as productId,

src/main/resources/mapper/PriceMapper.xml

@@ -229,7 +229,7 @@
                cmps.cmPercent
         FROM cm_sku cs
                  LEFT JOIN cm_mall_product_sku cmps ON cs.skuId = cmps.skuId
-        WHERE cmps.delFlag = 0 ( cmps.productId = #{productId} OR cmps.mallProductId = #{productId} )
+        WHERE  cmps.productId = #{productId} OR cmps.mallProductId = #{productId}
         ORDER BY cmps.price ASC
     </select>
     <select id="findLowPrice" resultType="com.caimei365.commodity.model.vo.ProductItemVo">