Merge remote-tracking branch 'origin/developerD' into developerD

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

@@ -133,6 +133,13 @@ public interface PageMapper {
      */
     ProductDetailVo getProductDetails(Integer productId);
 
+    /**
+     * 商品详情页 组织
+     * @param productId
+     * @return
+     */
+    ProductDetailVo getProductOrganizeDetails(Integer productId);
+
     /**
      * 再次购买
      *

src/main/java/com/caimei365/commodity/service/impl/MallOrganizeServiceImpl.java

@@ -59,7 +59,12 @@ public class MallOrganizeServiceImpl implements MallOrganizeService {
                     // 价格等级
                     product.setPriceGrade(priceUtilService.getPriceGrade(product.getPrice()));
                 });
-                floor.setProducts(productVos);
+                // 只显示6条
+                if (productVos.size() > 6) {
+                    floor.setProducts(productVos.subList(0, 6));
+                } else {
+                    floor.setProducts(productVos);
+                }
             }
         }
         map.put("floorList", floorList);

src/main/java/com/caimei365/commodity/service/impl/PageServiceImpl.java

@@ -672,7 +672,7 @@ public class PageServiceImpl implements PageService {
     @Override
     public ResponseJson<ProductDetailVo> getProductOrganizeDetails(Integer productId, Integer userId) {
         // 商品详情页
-        ProductDetailVo product = pageMapper.getProductDetails(productId);
+        ProductDetailVo product = pageMapper.getProductOrganizeDetails(productId);
         //当该商品的“能否退货”字段的值是“不能”时,新增特殊商品退货须知提示
         /*if (product == null) {
             //商品不存在

src/main/resources/mapper/PageMapper.xml

@@ -299,6 +299,76 @@
                  left join shop s on s.shopId = p.shopId
         where p.productID = #{productId}
     </select>
+    <select id="getProductOrganizeDetails" resultType="com.caimei365.commodity.model.vo.ProductDetailVo">
+        select p.productID                                                                                     as productId,
+               p.shopID                                                                                        as shopId,
+               (select normalPrice
+                from cm_sku
+                where productId = #{productId}
+                order by price asc
+                limit 1)                                                                                       as normalPrice,
+               ifnull((select stock from cm_sku where productId = #{productId} order by price asc limit 1), 0) as stock,
+               (select minBuyNumber
+                from cm_mall_product_sku
+                where productId = #{productId} or mallProductId = #{productId}
+                order by price asc
+                limit 1)                                                                                       as minBuyNumber,
+               (select cs.unit from cm_sku cs
+                   left join cm_mall_product_sku cmps on cs.skuId = cmps.skuId
+               where cmps.productId = #{productId} or cmps.mallProductId = #{productId} order by cs.price asc limit 1)             as unit,
+               p.name,
+               p.aliasName,
+               p.commodityType,
+               p.mainImage,
+               p.invoiceType,
+               p.bigTypeID                                                                                     as bigTypeId,
+               p.smallTypeID                                                                                   as smallTypeId,
+               p.tinyTypeID                                                                                    as tinyTypeId,
+               p.searchKey,
+               p.visibility,
+               p.commodityDetailsFlag,
+               p.brandID                                                                                       as brandId,
+               p.productType,
+               p.tags,
+               p.includedTax,
+               p.productCategory,
+               p.serviceNumber,
+               p.taxPoint,
+               p.supplierTaxPoint,
+               p.priceFlag,
+               p.actFlag,
+               p.addTime,
+               p.hasSkuFlag,
+               p.sellNumber,
+               p.sortIndex,
+               p.featuredFlag,
+               p.recommendType,
+               p.machineType,
+               p.productCode,
+               p.updateTime,
+               p.validFlag,
+               p.searchKey,
+               p.allAreaFlag,
+               p.step,
+               p.provinceIds,
+               p.qualificationImg,
+               p.trainingMethod,
+               p.trainingType,
+               p.trainingFee,
+               p.productRemarks,
+               p.productDetail                                                                                 as productDetailChose,
+               s.shopType                                                                                      as shopType,
+               p.qualificationNo                                                                               as qualificationNo,
+               p.productName                                                                                   as productName,
+               p.qualificationTime                                                                             as qualificationTime,
+               p.qualificationLink                                                                             as qualificationLink,
+               p.returnGoodsStutas,
+               P.relatedLabels
+        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}
+    </select>
     <select id="getBuyAgainProducts" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select p.productID                 as productId,
                p.actStatus,

src/main/resources/mapper/PriceMapper.xml

@@ -215,7 +215,6 @@
     <select id="findOrganizeSkus" resultType="com.caimei365.commodity.model.vo.MallProductSkuVo">
         SELECT cmps.id,
                cs.skuId,
-               cs.price,
                cs.normalPrice,
                cs.costPrice,
                IFNULL(cs.ladderPriceFlag, 0) AS ladderPriceFlag,
@@ -231,7 +230,7 @@
         FROM cm_sku cs
                  LEFT JOIN cm_mall_product_sku cmps ON cs.skuId = cmps.skuId
         WHERE cmps.productId = #{productId}
-        ORDER BY cs.price ASC
+        ORDER BY cmps.price ASC
     </select>
     <select id="findLowPrice" resultType="com.caimei365.commodity.model.vo.ProductItemVo">
         select plp.buyPrice as price, cs.unit as unit, plp.buyNum as minBuyNumber, cs.skuId as skuId, cs.stock