证书相关信息

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

@@ -221,7 +221,7 @@ public class ProductDto implements Serializable {
      * @return
      */
     @ApiModelProperty("证书有效日期")
-    public Date qualificationTime;
+    public String qualificationTime;
 
     /**
      *证书有效链接

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

@@ -275,7 +275,7 @@ public class ProductPo implements Serializable {
     /*
      *证书有效日期
      */
-    public Date qualificationTime;
+    public String qualificationTime;
 
     /**
      *证书有效链接

src/main/java/com/caimei365/commodity/model/vo/ProductFormVo.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;
 
 /**
@@ -264,4 +266,24 @@ public class ProductFormVo implements Serializable {
 
 //新品审核状态 1，审核通过2，审核未通过3，待审核
     private Integer newvalidFlag;
+    /**
+     * 证书编号
+     * @return
+     */
+    public String qualificationNo;
+
+    /**
+     *产品名称
+     */
+    public String productName;
+    /*
+     *证书有效日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    public Date qualificationTime;
+
+    /**
+     *证书有效链接
+     */
+    public String qualificationLink;
 }

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

@@ -290,7 +290,7 @@ public class ShopServiceImpl implements ShopService {
             product.setActFlag(0);
             product.setLadderPriceFlag(0);
             product.setVisibility(3);
-
+            log.info("+++++++++++++++++++++++++"+product);
             shopMapper.insertProduct(product);
             if (StringUtils.isBlank(productDto.getProductCode())) {
                 String productCode = shopMapper.getCodeByTypeId(productDto.getBigTypeId(), productDto.getSmallTypeId(), productDto.getTinyTypeId());
@@ -299,6 +299,7 @@ public class ShopServiceImpl implements ShopService {
                 shopMapper.updateProductCode(productCode, product.getProductId());
             }
         } else {
+            log.info(">>>>>>>>>>>>>>>>>>"+product);
             shopMapper.updateProduct(product);
         }
         //保存或修改商品图片

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,p.qualificationNo,p.productName,p.qualificationTime,p.qualificationLink
+               s.shopType as shopType,p.qualificationNo as qualificationNo,p.productName as productName,p.qualificationTime as qualificationTime,p.qualificationLink as qualificationLink
         from product p
         left join shop s on s.shopId= p.shopId
         where p.productID = #{productId}

src/main/resources/mapper/ShopMapper.xml

@@ -6,7 +6,6 @@
         insert into product (
         shopID, name, aliasName, commodityType, bigTypeID, smallTypeID, tinyTypeID, mainImage,
         brandID, productType, tags, unit, normalPrice, price, includedTax, minBuyNumber, stock,
-
         <if test="productCategory != null and  productCategory != '' ">
             productCategory,
         </if>
@@ -85,29 +84,12 @@
         <if test="qualificationTime != null and  qualificationTime != ''">
             qualificationTime,
         </if>
-        <if test="qualificationLink != null and  qualificationLink != ''">
-            qualificationLink,
-        </if>
-        updateTime,validFlag,newProductType,showFlag,
+
+        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>
@@ -177,6 +159,15 @@
         <if test="invoiceType != null and  invoiceType != ''">
             #{invoiceType},
         </if>
+        <if test="qualificationNo != null and  qualificationNo != ''">
+            #{qualificationNo},
+        </if>
+        <if test="productName != null and  productName != ''">
+            #{productName},
+        </if>
+        <if test="qualificationTime != null and  qualificationTime != ''">
+            #{qualificationTime},
+        </if>
         #{updateTime}, #{validFlag},#{newProductType},#{showFlag}
         )
     </insert>
@@ -559,7 +550,11 @@
                trainingMethod,
                trainingType,
                trainingFee,
-               ifnull(newProductType, 2) as newProductType
+               ifnull(newProductType, 2) as newProductType,
+                qualificationNo as qualificationNo,
+                productName as productName,
+               qualificationTime as qualificationTime,
+               qualificationLink as qualificationLink
         from product
         where productID = #{productId}
     </select>