商城首页增加新品橱窗楼层

src/main/java/com/caimei365/commodity/model/dto/ProductDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * Description
@@ -202,6 +203,32 @@ public class ProductDto implements Serializable {
      */
     @ApiModelProperty("新品参与状态：1.参与2.未参与")
     private Integer newProductType;
+    /**
+     * 证书编号
+     * @return
+     */
+    @ApiModelProperty("证书编号")
+    public String qualificationNo;
+
+    /**
+     *产品名称
+     * @return
+     */
+    @ApiModelProperty("产品名称")
+    public String productName;
+    /**
+     *证书有效日期
+     * @return
+     */
+    @ApiModelProperty("证书有效日期")
+    public Date qualificationTime;
+
+    /**
+     *证书有效链接
+     * @return
+     */
+    @ApiModelProperty("证书有效链接")
+    public String qualificationLink;
 
 
 }

src/main/java/com/caimei365/commodity/model/po/ProductPo.java

@@ -262,4 +262,24 @@ public class ProductPo implements Serializable {
 
     private String BrandName;
 
+    /**
+     * 证书编号
+     * @return
+     */
+    public String qualificationNo;
+
+    /**
+     *产品名称
+     */
+    public String productName;
+    /*
+     *证书有效日期
+     */
+    public Date qualificationTime;
+
+    /**
+     *证书有效链接
+     */
+    public String qualificationLink;
+
 }

src/main/java/com/caimei365/commodity/model/vo/ProductDetailVo.java

@@ -3,11 +3,13 @@ package com.caimei365.commodity.model.vo;
 import com.caimei365.commodity.model.po.ProductDetailInfoPo;
 import com.caimei365.commodity.model.po.ProductImagePo;
 import com.caimei365.commodity.model.po.ProductParameterPo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -331,4 +333,24 @@ public class ProductDetailVo implements Serializable {
      * 普通机构商品详情 1同资质机构商品详情，2用普通机构商品详情
      */
     private Integer productDetailChose;
+    /**
+     * 证书编号
+     * @return
+     */
+    public String qualificationNo;
+
+    /**
+     *产品名称
+     */
+    public String productName;
+    /*
+     *证书有效日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    public Date qualificationTime;
+
+    /**
+     *证书有效链接
+     */
+    public String qualificationLink;
 }

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

@@ -267,6 +267,9 @@ public class ShopServiceImpl implements ShopService {
         product.setUpdateTime(current);
         product.setValidFlag(1);
         product.setProductCategory(1);
+        product.setQualificationNo(productDto.getQualificationNo());
+        product.setProductName(productDto.getProductName());
+        product.setQualificationTime(productDto.getQualificationTime());
         //设置主图
         for (Map<String, String> map : imageList) {
             String mainFlag = map.get("mainFlag");
@@ -287,6 +290,7 @@ public class ShopServiceImpl implements ShopService {
             product.setActFlag(0);
             product.setLadderPriceFlag(0);
             product.setVisibility(3);
+
             shopMapper.insertProduct(product);
             if (StringUtils.isBlank(productDto.getProductCode())) {
                 String productCode = shopMapper.getCodeByTypeId(productDto.getBigTypeId(), productDto.getSmallTypeId(), productDto.getTinyTypeId());

src/main/resources/mapper/PageMapper.xml

@@ -195,7 +195,7 @@
                p.addTime, p.hasSkuFlag, p.sellNumber, p.sortIndex, p.featuredFlag, p.costCheckFlag, p.recommendType, p.machineType,
                p.productCode, p.updateTime, p.validFlag, p.searchKey, p.allAreaFlag, p.step, p.costPrice, p.provinceIds, p.qualificationImg,
                p.trainingMethod, p.trainingType ,p.trainingFee, p.productRemarks,p.productDetail as productDetailChose,
-               s.shopType as shopType
+               s.shopType as shopType,p.qualificationNo,p.productName,p.qualificationTime,p.qualificationLink
         from product p
         left join shop s on s.shopId= p.shopId
         where p.productID = #{productId}

src/main/resources/mapper/ShopMapper.xml

@@ -76,11 +76,38 @@
         <if test="invoiceType != null and  invoiceType != ''">
             invoiceType,
         </if>
-        updateTime,validFlag,newProductType,showFlag
+        <if test="qualificationNo != null and  qualificationNo != ''">
+            qualificationNo,
+        </if>
+        <if test="productName != null and  productName != ''">
+            productName,
+        </if>
+        <if test="qualificationTime != null and  qualificationTime != ''">
+            qualificationTime,
+        </if>
+        <if test="qualificationLink != null and  qualificationLink != ''">
+            qualificationLink,
+        </if>
+        updateTime,validFlag,newProductType,showFlag,
         ) values (
         #{shopId}, #{name}, #{aliasName}, #{commodityType}, #{bigTypeId}, #{smallTypeId}, #{tinyTypeId}, #{mainImage},
         #{brandId}, #{productType}, #{tags}, #{unit}, #{normalPrice}, #{price}, #{includedTax}, #{minBuyNumber},
         #{stock},
+
+
+
+        <if test="qualificationNo != null and  qualificationNo != ''">
+            #{qualificationNo},
+        </if>
+        <if test="productName != null and  productName != ''">
+            #{productName},
+        </if>
+        <if test="qualificationTime != null and  qualificationTime != ''">
+            #{qualificationTime},
+        </if>
+        <if test="qualificationLink != null and  qualificationLink != ''">
+            #{qualificationLink},
+        </if>
         <if test="productCategory != null and  productCategory != '' ">
             #{productCategory},
         </if>
@@ -157,9 +184,24 @@
         update product set
         shopID = #{shopId}, name = #{name}, aliasName = #{aliasName}, commodityType = #{commodityType},
         bigTypeId = #{bigTypeId}, smallTypeId = #{smallTypeId}, tinyTypeId = #{tinyTypeId}, mainImage = #{mainImage},
-        brandId = #{brandId}, productType = #{productType}, tags = #{tags}, unit = #{unit}, normalPrice = #{normalPrice},
-        price = #{price}, price = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock =#{stock},
+        brandId = #{brandId}, productType = #{productType}, tags = #{tags}, unit = #{unit}, normalPrice =
+        #{normalPrice},
+        price = #{price}, price = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock
+        =#{stock},
         newProductType=#{newProductType},
+        <if test="qualificationNo !=null and qualificationNo != ''">
+            qualificationNo=#{qualificationNo},
+        </if>
+        <if test="productName !=null and productName != ''">
+            productName=#{productName},
+        </if>
+        <if test="qualificationTime !=null and qualificationTime != ''">
+            qualificationTime=#{qualificationTime},
+        </if>
+        <if test="qualificationLink !=null and qualificationLink != ''">
+            qualificationLink=#{qualificationLink},
+        </if>
+
         <if test="productCategory != null and  productCategory != ''">
             productCategory = #{productCategory},
         </if>
@@ -470,20 +512,20 @@
         order by mainFlag DESC
     </select>
     <select id="getProductForm" resultType="com.caimei365.commodity.model.vo.ProductFormVo">
-        select productID   as productId,
-               shopID      as shopId,
+        select productID                 as productId,
+               shopID                    as shopId,
                name,
                aliasName,
                commodityType,
                mainImage,
                stock,
                invoiceType,
-               bigTypeID   as bigTypeId,
-               smallTypeID as smallTypeId,
-               tinyTypeID  as tinyTypeId,
+               bigTypeID                 as bigTypeId,
+               smallTypeID               as smallTypeId,
+               tinyTypeID                as tinyTypeId,
                searchKey,
                visibility,
-               brandID     as brandId,
+               brandID                   as brandId,
                productType,
                tags,
                unit,
@@ -517,7 +559,7 @@
                trainingMethod,
                trainingType,
                trainingFee,
-               ifnull(newProductType,2) as newProductType
+               ifnull(newProductType, 2) as newProductType
         from product
         where productID = #{productId}
     </select>