Aslee 3 роки тому
батько
коміт
572aed8b92

+ 2 - 26
src/main/java/com/caimei/model/po/ProductDetailInfoPo.java

@@ -10,39 +10,15 @@ import java.io.Serializable;
  */
 @Data
 public class ProductDetailInfoPo implements Serializable {
-    private Integer productDetailInfoId;
-
-    /**
-     * 商品Id
-     */
-    private Integer productId;
-
-    private String propValueAlias;
-
-    private String propValueImages;
-
     /**
      * 商品详情信息
      */
     private String detailInfo;
 
-    private String detailInfoTxt;
-
-    private String seoTitle;
-
-    private String seoKeyword;
-
-    private String seoDes;
-
-    /**
-     * 服务详情
-     */
-    private String serviceInfo;
-
     /**
-     * 订购方案
+     * 商品详情介绍
      */
-    private String orderInfo;
+    private String detailInfoText;
 
     private static final long serialVersionUID = 1L;
 }

+ 0 - 27
src/main/java/com/caimei/model/po/ProductImagePo.java

@@ -10,37 +10,10 @@ import java.io.Serializable;
  */
 @Data
 public class ProductImagePo implements Serializable {
-    private Integer productImageId;
-
-    /**
-     * 商品Id
-     */
-    private Integer productId;
-
-    /**
-     * 商品对应供应商Id
-     */
-    private Integer shopId;
-
-    /**
-     * 添加时间
-     */
-    private String addTime;
-
     /**
      * 图片
      */
     private String image;
 
-    /**
-     * 是否主图:1是,空或0不是
-     */
-    private String mainFlag;
-
-    /**
-     * 排序值
-     */
-    private Integer sortIndex;
-
     private static final long serialVersionUID = 1L;
 }

+ 8 - 3
src/main/java/com/caimei/model/vo/ProductDetailVo.java

@@ -67,12 +67,17 @@ public class ProductDetailVo {
     private String brandName;
 
     /**
-     * 商品图片
+     * 商品所有图片,以,隔开
      */
-    private List<ProductImagePo> imageList;
+    private String images;
 
     /**
      * 商品详情
      */
-    private ProductDetailInfoPo productDetail;
+    private String detailInfo;
+
+    /**
+     * 商品详情介绍
+     */
+    private String detailInfoText;
 }

+ 6 - 3
src/main/java/com/caimei/service/impl/ProductServiceImpl.java

@@ -117,15 +117,18 @@ public class ProductServiceImpl implements ProductService {
         productDetail.setImage(ProductUtils.getImageURL("product", product.getMainImage(), 0, domain));
         //商品图片
         List<ProductImagePo> imageList = productMapper.findProductImagesByOriginalId(product.getOriginalProductId());
+        String images = "";
         for (ProductImagePo image : imageList) {
             String imageURL = ProductUtils.getImageURL("product", image.getImage(), 0, domain);
             image.setImage(imageURL);
+            images += "".equals(images) ? "" : "," + image.getImage();
         }
-        productDetail.setImageList(imageList);
+        productDetail.setImages(images);
         DecimalFormat decimalFormat = new DecimalFormat("0000");
         //商品详情
-        ProductDetailInfoPo info = productMapper.findProductDetailByOriginalId(product.getOriginalProductId());
-        productDetail.setProductDetail(info);
+        ProductDetailInfoPo detailInfo = productMapper.findProductDetailByOriginalId(product.getOriginalProductId());
+        productDetail.setDetailInfo(detailInfo.getDetailInfo());
+        productDetail.setDetailInfoText(detailInfo.getDetailInfoText());
         productDetail.setProductId(decimalFormat.format(product.getProductId()));
         productDetail.setProductName(product.getProductName());
         productDetail.setShopName(product.getShopName());

+ 2 - 3
src/main/resources/mapper/ProductMapper.xml

@@ -125,15 +125,14 @@
     </select>
     <select id="findProductImagesByOriginalId" resultType="com.caimei.model.po.ProductImagePo">
         select
-            productImageID as productImageId, productID as productId, shopID as shopId, addTime, image, mainFlag, sortIndex
+             image
         from productimage
         where productID = #{productId}
         ORDER BY mainFlag DESC
     </select>
     <select id="findProductDetailByOriginalId" resultType="com.caimei.model.po.ProductDetailInfoPo">
         select
-            productDetailInfoID as productDetailInfoId, productID as productId, propValueAlias, propValueImages, detailInfo, detailInfoTxt,
-            seoTitle, seoKeyword, seoDes, serviceInfo, orderInfo
+             detailInfo
         from productdetailinfo
         where productID = #{productId,jdbcType=BIGINT}
     </select>