Merge remote-tracking branch 'remotes/origin/developer' into developerC

src/main/java/com/caimei/controller/admin/data/VideoApi.java

@@ -56,10 +56,11 @@ public class VideoApi {
         Integer videoId = paramsMap.getInteger("videoId");
         Integer authUserId = paramsMap.getInteger("authUserId");
         String videoTitle = paramsMap.getString("videoTitle");
+        String videoImage = paramsMap.getString("videoImage");
         String videoName = paramsMap.getString("videoName");
         String videoPreviewUrl = paramsMap.getString("videoPreviewUrl");
         String videoDownloadUrl = paramsMap.getString("videoDownloadUrl");
-        return videoService.saveVideo(videoId, authUserId, videoTitle, videoName, videoPreviewUrl, videoDownloadUrl);
+        return videoService.saveVideo(videoId, authUserId, videoTitle, videoImage, videoName, videoPreviewUrl, videoDownloadUrl);
     }
 
     @ApiOperation("更新视频状态")

src/main/java/com/caimei/model/po/VideoPo.java

@@ -25,6 +25,11 @@ public class VideoPo {
      */
     private String title;
 
+    /**
+     * 视频封面
+     */
+    private String image;
+
     /**
      * 视频名称
      */

src/main/java/com/caimei/model/vo/VideoListVo.java

@@ -18,6 +18,9 @@ public class VideoListVo {
     @ApiModelProperty("视频标题")
     private String videoTitle;
 
+    @ApiModelProperty("视频封面")
+    private String videoImage;
+
     @ApiModelProperty("视频名称")
     private String videoName;
 

src/main/java/com/caimei/model/vo/WxVideoListVo.java

@@ -18,6 +18,9 @@ public class WxVideoListVo {
     @ApiModelProperty("视频标题")
     private String videoTitle;
 
+    @ApiModelProperty("视频封面")
+    private String videoImage;
+
     @ApiModelProperty("视频名称")
     private String videoName;
 

src/main/java/com/caimei/service/auth/impl/ShopServiceImpl.java

@@ -306,9 +306,7 @@ public class ShopServiceImpl implements ShopService {
             // 编辑后的品牌列表和数据库中的品牌列表重复的需要更新的部分
             List<Integer> updateInfoBrandList = new ArrayList<>();
             // 编辑后的供应商品牌id
-            shopInfoList.forEach(shopInfo->{
-                newInfoBrandList.add(shopInfo.getBrandId());
-            });
+            shopInfoList.forEach(shopInfo-> newInfoBrandList.add(shopInfo.getBrandId()));
             for (ShopBrandVo shopBrand : dbInfoBrandList) {
                 // 判断被删除的品牌下是否还有未删除的商品，若存在，提示供应商需要删除后才能删除品牌
                 if (!newInfoBrandList.contains(shopBrand.getBrandId())) {

src/main/java/com/caimei/service/data/VideoService.java

@@ -37,7 +37,7 @@ public interface VideoService {
      * @param videoDownloadUrl       oss名称
      * @return  ResponseJson
      */
-    ResponseJson saveVideo(Integer videoId, Integer authUserId, String videoTitle, String videoName, String videoPreviewUrl, String videoDownloadUrl);
+    ResponseJson saveVideo(Integer videoId, Integer authUserId, String videoTitle, String videoImage, String videoName, String videoPreviewUrl, String videoDownloadUrl);
 
     /**
      * 更新视频状态

src/main/java/com/caimei/service/data/impl/VideoServiceImpl.java

@@ -63,13 +63,16 @@ public class VideoServiceImpl implements VideoService {
     }
 
     @Override
-    public ResponseJson saveVideo(Integer videoId, Integer authUserId, String videoTitle, String videoName, String videoPreviewUrl, String videoDownloadUrl) {
+    public ResponseJson saveVideo(Integer videoId, Integer authUserId, String videoTitle, String videoImage, String videoName, String videoPreviewUrl, String videoDownloadUrl) {
         if (null == videoId && null == authUserId) {
             return ResponseJson.error("参数异常，请输入供应商用户id");
         }
         if (StringUtils.isEmpty(videoTitle)) {
             return ResponseJson.error("参数异常，请输入视频标题");
         }
+        if (StringUtils.isEmpty(videoTitle)) {
+            return ResponseJson.error("参数异常，请输入视频封面");
+        }
         if (StringUtils.isEmpty(videoName)) {
             return ResponseJson.error("参数异常，请输入视频名称");
         }
@@ -81,6 +84,7 @@ public class VideoServiceImpl implements VideoService {
         */
         VideoPo video = new VideoPo();
         video.setTitle(videoTitle);
+        video.setImage(videoImage);
         video.setName(videoName);
         video.setPreviewUrl(videoPreviewUrl);
         video.setDownloadUrl(videoDownloadUrl);

src/main/resources/mapper/AuthProductMapper.xml

@@ -300,10 +300,10 @@
     <select id="getAuthProductByProductId" resultType="com.caimei.module.base.entity.vo.AuthProductVo">
         select t.name       as productName,
                p.snCode,
-               t.pcImage,
-               t.appletsImage,
-               p.pcCertificateImage,
-               p.appletsCertificateImage,
+               t.image as pcImage,
+               t.image as appletsImage,
+               p.certificateImage as pcCertificateImage,
+               p.certificateImage as appletsCertificateImage,
                p.brandId,
                b.authLogo,
                b.name       as brandName,

src/main/resources/mapper/VideoMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.cmMapper.VideoMapper">
     <insert id="insertVideo" keyColumn="id" keyProperty="id" parameterType="com.caimei.model.po.VideoPo" useGeneratedKeys="true">
-        insert into cm_brand_video(authUserId, title, name, previewUrl, downloadUrl, auditStatus, status, createTime,
+        insert into cm_brand_video(authUserId, title, image, name, previewUrl, downloadUrl, auditStatus, status, createTime,
                                    auditBy, auditTime)
-        values (#{authUserId}, #{title}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},
+        values (#{authUserId}, #{title}, #{image}, #{name}, #{previewUrl}, #{downloadUrl}, #{auditStatus}, #{status},
                 #{createTime}, #{auditBy}, #{auditTime})
     </insert>
     <update id="updateVideoByVideoId">
@@ -34,6 +34,9 @@
             <if test="title != null and title != ''">
                 title = #{title},
             </if>
+            <if test="image != null and image != ''">
+                image = #{image},
+            </if>
             <if test="previewUrl != null and previewUrl != ''">
                 previewUrl = #{previewUrl},
             </if>
@@ -56,7 +59,7 @@
         delete from cm_brand_video where id = #{videoId}
     </delete>
     <select id="getVideoList" resultType="com.caimei.model.vo.VideoListVo">
-        select a.id as videoId,a.title as videoTitle,a.name as videoName, a.previewUrl as videoPreviewUrl, a.downloadUrl
+        select a.id as videoId,a.title as videoTitle,a.image as videoImage, a.name as videoName, a.previewUrl as videoPreviewUrl, a.downloadUrl
         as videoDownloadUrl,a.auditStatus,a.invalidReason,a.status,a.createTime,
         au.name as auditBy,a.auditTime
         from cm_brand_video a
@@ -81,7 +84,8 @@
         </choose>
     </select>
     <select id="getWxVideoList" resultType="com.caimei.model.vo.WxVideoListVo">
-        select id as videoId, title as videoTitle,name as videoName, previewUrl as videoPreviewUrl, downloadUrl as
+        select id as videoId, title as videoTitle,image as videoImage, name as videoName, previewUrl as videoPreviewUrl,
+        downloadUrl as
         videoDownloadUrl, date_format(createTime, '%Y-%m-%d') as createTime
         from cm_brand_video a
         where authUserId = #{authUserId}