品牌页增加品牌搜索大图

@@ -41,6 +41,9 @@ public interface ImagesConstant {
     // 品牌图片,与前台兼容
     String BUCKET_BRAND_LOGO = "brandLogo";
 
+    // 品牌搜索大图
+    String BUCKET_SEARCH_SHOW_IMAGE = "searchShowImage";
+
     // 销售类目图片
     String BUCKET_SALES_CATEGORY = "taobaocms";
 

@@ -38,6 +38,7 @@ public class ImagesHelper extends com.yoho.core.common.helpers.ImagesHelper{
 		BUCKET_LIST.put(ImagesConstant.BUCKET_SNS, ImagesConstant.BUCKET_SNS);
 		BUCKET_LIST.put(ImagesConstant.BUCKET_EVIDENCE, ImagesConstant.BUCKET_EVIDENCE);
 		BUCKET_LIST.put(ImagesConstant.BUCKET_BRAND_LOGO, ImagesConstant.BUCKET_BRAND_LOGO);
+		BUCKET_LIST.put(ImagesConstant.BUCKET_SEARCH_SHOW_IMAGE, ImagesConstant.BUCKET_SEARCH_SHOW_IMAGE);
 		BUCKET_LIST.put(ImagesConstant.BUCKET_GOODS_VIDEO, ImagesConstant.BUCKET_GOODS_VIDEO);
 		BUCKET_LIST.put(ImagesConstant.BUCKET_ACTIVITY_PIC, ImagesConstant.BUCKET_ACTIVITY_PIC);
 		BUCKET_LIST.put(ImagesConstant.BUCKET_PLUSTAR, ImagesConstant.BUCKET_PLUSTAR);

@@ -29,6 +29,8 @@ public class Brand implements Serializable {
 
     private Integer editPid;
 
+    private String searchShowImage;
+
     public Integer getId() {
         return id;
     }
@@ -101,6 +103,13 @@ public class Brand implements Serializable {
         this.editPid = editPid;
     }
 
+    public String getSearchShowImage() {
+        return searchShowImage;
+    }
+
+    public void setSearchShowImage(String searchShowImage) {
+        this.searchShowImage = searchShowImage;
+    }
 
     @Override
     public String toString() {
@@ -114,6 +123,7 @@ public class Brand implements Serializable {
                 ", createTime=" + createTime +
                 ", editTime=" + editTime +
                 ", editPid=" + editPid +
+                ", searchShowImage=" + searchShowImage +
                 '}';
     }
 }

@@ -12,15 +12,16 @@
         <result property="editTime" column="edit_time"/>
         <result property="createTime" column="create_time"/>
         <result property="editPid" column="edit_pid"/>
+        <result property="search_show_image" column="searchShowImage"/>
     </resultMap>
 
     <sql id="queryColumns">
-        id, brand_name, brand_name_en, brand_logo, brand_search, status, create_time
+        id, brand_name, brand_name_en, brand_logo, brand_search, status, create_time, search_show_image
     </sql>
 
     <insert id="insertBrand" parameterType="com.yoho.ufo.model.brand.Brand">
-        insert into brand(id, brand_name, brand_name_en, brand_logo, brand_search, status, create_time, edit_time, edit_pid)
-        values (#{id}, #{brandName}, #{brandNameEn}, #{brandLogo}, #{brandSearch}, #{status}, #{createTime}, #{editTime}, #{editPid})
+        insert into brand(id, brand_name, brand_name_en, brand_logo, search_show_image, brand_search, status, create_time, edit_time, edit_pid)
+        values (#{id}, #{brandName}, #{brandNameEn}, #{brandLogo}, #{searchShowImage}, #{brandSearch}, #{status}, #{createTime}, #{editTime}, #{editPid})
     </insert>
 
     <update id="updateBrandStatus" parameterType="com.yoho.ufo.model.brand.Brand">
@@ -51,7 +52,8 @@
             <if test="brand.editPid != null">
                 edit_pid = #{brand.editPid},
             </if>
-            brand_search = #{brand.brandSearch}
+            brand_search = #{brand.brandSearch},
+            search_show_image = #{brand.searchShowImage}
         </set>
         where id = #{brand.id}
     </update>

@@ -39,6 +39,7 @@ public class BrandServiceImpl implements IBrandService {
         brand.setEditTime(DateUtil.currentTimeSeconds());
         brand.setEditPid(getUserId());
         brand.setBrandLogo(ImagesHelper.getImageRelativeUrl(brand.getBrandLogo(), ImagesConstant.BUCKET_BRAND_LOGO));
+        brand.setSearchShowImage(ImagesHelper.getImageRelativeUrl(brand.getSearchShowImage(), ImagesConstant.BUCKET_SEARCH_SHOW_IMAGE));
         if (brand.getId() == null || brand.getId() == 0) {
             // 默认开启状态
             brand.setStatus(1);
@@ -68,6 +69,7 @@ public class BrandServiceImpl implements IBrandService {
             responseBo = OrikaUtils.map(brand1, BrandResponseBo.class);
             responseBo.setCreateTime(DateUtil.getDateStrBySecond(brand1.getCreateTime(), DateUtil.DATE_TIME_FORMAT));
             responseBo.setBrandLogo(ImagesHelper.getImageAbsoluteUrl(brand1.getBrandLogo(), ImagesConstant.BUCKET_BRAND_LOGO));
+            responseBo.setSearchShowImage(ImagesHelper.getImageAbsoluteUrl(brand1.getSearchShowImage(), ImagesConstant.BUCKET_SEARCH_SHOW_IMAGE));
             brandResponseBos.add(responseBo);
         }
         return new PageResponseBO<>(count, brandResponseBos, pageModel.getCurrentPage(), pageModel.getPageSize());
@@ -81,6 +83,7 @@ public class BrandServiceImpl implements IBrandService {
         BrandResponseBo brandResponseBo = OrikaUtils.map(brand, BrandResponseBo.class);
         brandResponseBo.setCreateTime(DateUtil.getDateStrBySecond(brand.getCreateTime(), DateUtil.DATE_TIME_FORMAT));
         brandResponseBo.setBrandLogo(ImagesHelper.getImageAbsoluteUrl(brand.getBrandLogo(), ImagesConstant.BUCKET_BRAND_LOGO));
+        brandResponseBo.setSearchShowImage(ImagesHelper.getImageAbsoluteUrl(brand.getSearchShowImage(), ImagesConstant.BUCKET_SEARCH_SHOW_IMAGE));
         return brandResponseBo;
     }
 

@@ -121,6 +121,17 @@
                     return '<img src="' + value + '"  style="width:98px;height:98px"/></a>';
                 }
             }, {
+                title: "品牌搜索大图",
+                field: "searchShowImage",
+                width: 80,
+                align: "center",
+                formatter: function (value) {
+                    if (value == null || value == '' || value == undefined) {
+                        return '';
+                    }
+                    return '<img src="' + value + '"  style="width:98px;height:98px"/></a>';
+                }
+            }, {
                 title: "品牌名称",
                 field: "brandName",
                 width: 100,
@@ -269,8 +280,9 @@
                                         if (!$("#brandEditForm").form("validate")) {
                                             return false;
                                         }
-                                        if ($("#brandEditForm #imageUpload").imageUpload("getValue") == null || $("#brandEditForm #imageUpload").imageUpload("getValue") == "") {
-                                            $.messager.alert("失败", "请上传图片", "error");
+                                        const brandLogoUpload = $("#brandEditForm #brandLogoUpload");
+                                        if (brandLogoUpload.imageUpload("getValue") == null || brandLogoUpload.imageUpload("getValue") === "") {
+                                            $.messager.alert("失败", "请上传品牌logo", "error");
                                             return false;
                                         }
                                         $.messager.progress({

@@ -19,10 +19,23 @@
                 <tr style="height: 60px">
                     <td width="10%"><span style="color:red">*</span>品牌LOGO</td>
                     <td>
-                        <div id="imageUpload">
+                        <div id="brandLogoUpload">
                         </div>
                     </td>
                 </tr>
+                <tr style="height: 60px">
+                    <td width="10%">品牌搜索大图</td>
+                    <td>
+                        <div id="searchShowImageUpload">
+                        </div>
+                    </td>
+                </tr>
+                <tr style="line-height: 0px">
+                    <td width="10%"></td>
+                    <td width="50%">
+                        <div style="color: #ab1e1e;margin-top: 0px">*请上传1035*501尺寸图片</div>
+                    </td>
+                </tr>
 
                 <tr class="coupon" style="height: 60px">
                     <td width="10%"></span>品牌搜索词</td>
@@ -61,7 +74,7 @@
             //width: 240
         });
 
-        $("#brandEditForm #imageUpload").imageUpload({
+        $("#brandEditForm #brandLogoUpload").imageUpload({
             width: 171,
             height: 120,
             realInputName: "brandLogo",
@@ -91,12 +104,43 @@
             }
         });
 
+        $("#brandEditForm #searchShowImageUpload").imageUpload({
+            width: 171,
+            height: 120,
+            realInputName: "searchShowImage",
+            url: contextPath + '/fileupload/upload',
+            queryParams: {
+                bucket: "searchShowImage"
+            },
+            onBeforeSubmit: function () {
+                $.messager.progress({
+                    title: "正在执行",
+                    msg: "正在执行，请稍后...",
+                    interval: 500,
+                    text: ""
+                });
+            },
+            filterFileName: function (data) {
+                if (!data || data.code != 200) {
+                    $.messager.progress("close");
+                    $.messager.alert("错误", data.message);
+                    return "";
+                }
+                return data.data;
+            },
+            onLoadSuccess: function (data) {
+                $.messager.progress("close");
+                return false;
+            }
+        });
+
         if (brandId > 0) {
             $.post(contextPath + "/brand/getBrandById", {
                 id: brandId
             }, function (data) {
                 $("#brandEditForm").form("load", data.data);
-                $("#brandEditForm #imageUpload").imageUpload("setValue", data.data.brandLogo);
+                $("#brandEditForm #brandLogoUpload").imageUpload("setValue", data.data.brandLogo);
+                $("#brandEditForm #searchShowImageUpload").imageUpload("setValue", data.data.searchShowImage);
             });
         }
     });