修改图片上传，以及商品上架逻辑

kmall-admin/src/main/java/com/kmall/admin/controller/SysOssController.java

@@ -109,6 +109,12 @@ public class SysOssController {
         }
 //        String name = file.getOriginalFilename();
 //        Thumbnails.of(name).size(200, 200).keepAspectRatio(false).allowOverwrite(true).toFile(name);
+        int AllowImgFileSize=0; //允许上传图片文件的大小 0为无限制 单位：KB
+        Long size = file.getSize();
+        int ImgFileSize=Math.round(size/1024*100)/100;//取得图片文件的大小
+        if(ImgFileSize > 200){
+            throw new RRException("上传图片，不能超过 300k");
+        }
         //上传文件
         String url = FileManager.upload(file);
 

kmall-admin/src/main/java/com/kmall/admin/controller/mk/store/MkStoreCampMinusGoodsController.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.kmall.admin.entity.mk.store.MkStoreCampMinusGoodsEntity;
 import com.kmall.admin.service.mk.store.MkStoreCampMinusGoodsService;
+import com.kmall.admin.utils.ParamUtils;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
@@ -46,6 +47,7 @@ public class MkStoreCampMinusGoodsController {
     @ResponseBody
     public R queryCampMinusGoodsByIdList(@RequestParam Map<String, Object> params) {
         //查询列表数据
+        ParamUtils.setName(params, "goodsName");
         Query query = new Query(params);
         List<MkStoreCampMinusGoodsEntity> mkStoreCampMinusGoodsList = mkStoreCampMinusGoodsService.queryCampMinusGoodsByIdList(query);
         int total = mkStoreCampMinusGoodsService.queryCampMinusGoodsByIdTotal(query);

kmall-admin/src/main/java/com/kmall/admin/dao/MerchUserDao.java

@@ -0,0 +1,23 @@
+package com.kmall.admin.dao;
+
+
+import com.kmall.admin.entity.MerchUserEntity;
+import com.kmall.manager.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Dao
+ *
+ * @author huangyq
+ * @email admin@qhdswl.com
+ * @date 2018-12-05 14:34:32
+ */
+public interface MerchUserDao extends BaseDao<MerchUserEntity> {
+    MerchUserEntity queryObjectByStoreId(@Param("storeId") Long storeId, @Param("userId") Long userId);
+
+    List<MerchUserEntity> queryMerchUserByLoadGoods(@Param("storeId") Long storeId);
+
+    Integer updateStoreLoadGoodsById(MerchUserEntity merchUserEntity);
+}

kmall-admin/src/main/java/com/kmall/admin/entity/MerchUserEntity.java

@@ -0,0 +1,181 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 实体
+ * 表名 mall_merch_user
+ *
+ * @author huangyq
+ * @email admin@qhdswl.com
+ * @date 2018-12-05 14:34:32
+ */
+public class MerchUserEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 商户编号
+     */
+    private String merchSn;
+    /**
+     * 门店编号
+     */
+    private Integer storeId;
+    /**
+     * 用户编号
+     */
+    private Integer userId;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date modTime;
+    /**
+     * 时间戳
+     */
+    private Date tstm;
+
+    private String isLoadGoods;
+
+    public String getIsLoadGoods() {
+        return isLoadGoods;
+    }
+
+    public void setIsLoadGoods(String isLoadGoods) {
+        this.isLoadGoods = isLoadGoods;
+    }
+
+    /**
+     * 设置：主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：主键
+     */
+    public Integer getId() {
+        return id;
+    }
+    /**
+     * 设置：商户编号
+     */
+    public void setMerchSn(String merchSn) {
+        this.merchSn = merchSn;
+    }
+
+    /**
+     * 获取：商户编号
+     */
+    public String getMerchSn() {
+        return merchSn;
+    }
+    /**
+     * 设置：门店编号
+     */
+    public void setStoreId(Integer storeId) {
+        this.storeId = storeId;
+    }
+
+    /**
+     * 获取：门店编号
+     */
+    public Integer getStoreId() {
+        return storeId;
+    }
+    /**
+     * 设置：用户编号
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取：用户编号
+     */
+    public Integer getUserId() {
+        return userId;
+    }
+    /**
+     * 设置：创建人编号
+     */
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    /**
+     * 获取：创建人编号
+     */
+    public String getCreaterSn() {
+        return createrSn;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：修改人编号
+     */
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    /**
+     * 获取：修改人编号
+     */
+    public String getModerSn() {
+        return moderSn;
+    }
+    /**
+     * 设置：修改时间
+     */
+    public void setModTime(Date modTime) {
+        this.modTime = modTime;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getModTime() {
+        return modTime;
+    }
+    /**
+     * 设置：时间戳
+     */
+    public void setTstm(Date tstm) {
+        this.tstm = tstm;
+    }
+
+    /**
+     * 获取：时间戳
+     */
+    public Date getTstm() {
+        return tstm;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/entity/StoreEntity.java

@@ -82,16 +82,6 @@ public class StoreEntity implements Serializable {
 
     private String isValid;
 
-    private String isLoadGoods;
-
-    public String getIsLoadGoods() {
-        return isLoadGoods;
-    }
-
-    public void setIsLoadGoods(String isLoadGoods) {
-        this.isLoadGoods = isLoadGoods;
-    }
-
     public String getIsValid() {
         return isValid;
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -56,6 +56,8 @@ public class GoodsServiceImpl implements GoodsService {
     private ThirdMerchantBizDao thirdMerchantBizDao;
     @Autowired
     private MngChangeDao mngChangeDao;
+    @Autowired
+    private MerchUserDao merchUserDao;
 
     @Override
     public GoodsEntity queryObject(Integer id) {
@@ -335,20 +337,6 @@ public class GoodsServiceImpl implements GoodsService {
         if (galleryEntityList == null || galleryEntityList.size() <= 0) {
             throw new RRException("至少保留一张商品轮播图！");
         }
-        List<ProductStoreRelaEntity> proStoreList = productStoreRelaDao.queryByGoodsId(goodsEntity.getId());
-        Long[] storeIds = new Long[proStoreList.size()];
-        if(goodsEntity.getIsStockShare().equalsIgnoreCase(Dict.isStockShare.item_0.getItem())) {
-            Integer goodsNumber = goods.getGoodsNumber();//商品总库存
-            Integer storeTotalGoodsNumber = 0;//商品分配库存
-            for (int i = 0; i < proStoreList.size(); i++) {
-                ProductStoreRelaEntity relaEntity = proStoreList.get(i);
-                storeTotalGoodsNumber = storeTotalGoodsNumber + relaEntity.getStockNum();
-                storeIds[i] = relaEntity.getStoreId();
-            }
-            if (goodsNumber < storeTotalGoodsNumber) {
-                throw new RRException("该商品已在各门店分配库存" + storeTotalGoodsNumber + "，当前商品总库存不能小于分配库存总额！请先修改门店库存！");
-            }
-        }
 
         List<GoodsEntity> prodbarGoodsList = goodsDao.queryObjectByProdBarcode(goods.getProdBarcode(),goods.getMerchSn(),goods.getId());
         if(prodbarGoodsList != null && prodbarGoodsList.size() > 0){
@@ -412,9 +400,12 @@ public class GoodsServiceImpl implements GoodsService {
         goodsDao.update(goods);
 
         // 保税商品修改各个门店商品价格
-        List<ProductStoreRelaEntity> productStoreRelaEntityList = productStoreRelaDao.queryByGoodsId(goods.getId());
+        List<ProductStoreRelaEntity> productStoreRelaEntityList = productStoreRelaDao.queryByGoodsId(goodsEntity.getId());
+        Long[] storeIds = new Long[productStoreRelaEntityList.size()];
+        Integer goodsNumber = goods.getGoodsNumber();//商品总库存
+        Integer storeTotalGoodsNumber = 0;//商品分配库存
         if (productStoreRelaEntityList != null && productStoreRelaEntityList.size() > 0) {
-            for (ProductStoreRelaEntity productStoreRela : productStoreRelaEntityList) {
+            for (int i = 0; i < productStoreRelaEntityList.size(); i++) {
                 //修改该商品的所属商户信息，如在该商户门店中有该上架的商品信息，则提示该商品不能修改
                 /*if(org.apache.commons.lang3.StringUtils.isNotEmpty(productStoreRela.getMerchSn()) && productStoreRela.getMerchSn().equalsIgnoreCase(goods.getMerchSn())
                         && goods.getIsOnSale() == Integer.parseInt(Dict.isOnSale.item_1.getItem())) {
@@ -439,13 +430,21 @@ public class GoodsServiceImpl implements GoodsService {
                         throw new RRException("商品编码为【" + goods.getGoodsSn() + "】的商品已上架在商户编号为【" + productStoreRela.getMerchSn() + "】的门店中，可先将该商品下架后再进行修改！");
                     }
                 }*/
-                if(org.apache.commons.lang3.StringUtils.isNotEmpty(productStoreRela.getMerchSn()) && productStoreRela.getMerchSn().equalsIgnoreCase(goods.getMerchSn())
+                ProductStoreRelaEntity relaEntity = productStoreRelaEntityList.get(i);
+                if(org.apache.commons.lang3.StringUtils.isNotEmpty(relaEntity.getMerchSn()) && relaEntity.getMerchSn().equalsIgnoreCase(goods.getMerchSn())
                         && goods.getIsOnSale() == Integer.parseInt(Dict.isOnSale.item_1.getItem())) {
                 }else {
                     if (goods.getIsOnSale() != Integer.parseInt(Dict.isOnSale.item_0.getItem())) {
-                        throw new RRException("商品编码为【" + goods.getGoodsSn() + "】的商品已上架在商户编号为【" + productStoreRela.getMerchSn() + "】的门店中，可先将该商品下架后再进行修改！");
+                        throw new RRException("商品编码为【" + goods.getGoodsSn() + "】的商品已上架在商户编号为【" + relaEntity.getMerchSn() + "】的门店中，可先将该商品下架后再进行修改！");
                     }
                 }
+                storeTotalGoodsNumber = storeTotalGoodsNumber + relaEntity.getStockNum();
+                storeIds[i] = relaEntity.getStoreId();
+            }
+        }
+        if(goodsEntity.getIsStockShare().equalsIgnoreCase(Dict.isStockShare.item_0.getItem())) {
+            if (goodsNumber < storeTotalGoodsNumber) {
+                throw new RRException("该商品已在各门店分配库存" + storeTotalGoodsNumber + "，当前商品总库存不能小于分配库存总额！请先修改门店库存！");
             }
         }
 
@@ -525,6 +524,12 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsSpecificationDao.save(goodsSpecification);
             }
 
+            //更新门店商品是否有修改字段
+            if(storeIds.length > 0){
+                for(int i=0;i<storeIds.length;i++){
+                    updateLoadGoodsByStoreId(storeIds[i], user);
+                }
+            }
             if(product == null){
                 product = new ProductEntity();
                 product.setGoodsSn(goods.getGoodsSn());
@@ -540,12 +545,6 @@ public class GoodsServiceImpl implements GoodsService {
                 return productDao.update(product);
             }
         }
-        //更新门店商品是否有修改字段
-        if(storeIds.length > 0){
-            for(int i=0;i<storeIds.length;i++){
-                updateLoadGoodsByStoreId(storeIds[i], user);
-            }
-        }
         return 1;
     }
 
@@ -555,12 +554,13 @@ public class GoodsServiceImpl implements GoodsService {
      * @param user
      */
     private void updateLoadGoodsByStoreId(Long storeId, SysUserEntity user){
-        StoreEntity storeEntity = new StoreEntity();
-        storeEntity.setIsLoadGoods("1");
-        storeEntity.setModerSn(user.getUsername());
-        storeEntity.setModTime(new Date());
-        storeEntity.setId(storeId);
-        storeDao.update(storeEntity);
+        List<MerchUserEntity> list = merchUserDao.queryMerchUserByLoadGoods(storeId);
+        for(MerchUserEntity entity : list) {
+            entity.setIsLoadGoods("1");
+            entity.setModerSn(user.getUsername());
+            entity.setStoreId(Integer.valueOf(String.valueOf(storeId)));
+            merchUserDao.updateStoreLoadGoodsById(entity);
+        }
     }
 
     @Override

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -59,6 +59,8 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
     private MkDistSellAllocationDao mkDistSellAllocationDao;
     @Autowired
     private StoreDao storeDao;
+    @Autowired
+    private MerchUserDao merchUserDao;
 
     @Override
     public ProductStoreRelaEntity queryObject(Integer id) {
@@ -454,12 +456,13 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
      * @param user
      */
     private void updateLoadGoodsByStoreId(String storeId, SysUserEntity user){
-        StoreEntity storeEntity = new StoreEntity();
-        storeEntity.setIsLoadGoods("1");
-        storeEntity.setModerSn(user.getUsername());
-        storeEntity.setModTime(new Date());
-        storeEntity.setId(Long.valueOf(storeId));
-        storeDao.update(storeEntity);
+        List<MerchUserEntity> list = merchUserDao.queryMerchUserByLoadGoods(Long.valueOf(storeId));
+        for(MerchUserEntity entity : list) {
+            entity.setIsLoadGoods("1");
+            entity.setStoreId(Integer.valueOf(String.valueOf(storeId)));
+            entity.setModerSn(user.getUsername());
+            merchUserDao.updateStoreLoadGoodsById(entity);
+        }
     }
 
     /**

kmall-admin/src/main/resources/mybatis/mapper/MerchUserDao.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.kmall.admin.dao.MerchUserDao">
+
+    <resultMap type="com.kmall.admin.entity.MerchUserEntity" id="merchUserMap">
+        <result property="id" column="id"/>
+        <result property="merchSn" column="merch_sn"/>
+        <result property="storeId" column="store_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createrSn" column="creater_sn"/>
+        <result property="createTime" column="create_time"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="modTime" column="mod_time"/>
+        <result property="tstm" column="tstm"/>
+		<result property="isLoadGoods" column="is_load_goods"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.MerchUserEntity">
+		select
+			`id`,
+			`merch_sn`,
+			`store_id`,
+			`user_id`,
+			`creater_sn`,
+			`create_time`,
+			`moder_sn`,
+			`mod_time`,
+			is_load_goods,
+			`tstm`
+		from mall_merch_user
+		where id = #{id}
+	</select>
+
+	<select id="queryObjectByStoreId" resultType="com.kmall.admin.entity.MerchUserEntity">
+		select
+		`id`,
+		`merch_sn`,
+		`store_id`,
+		`user_id`,
+		`creater_sn`,
+		`create_time`,
+		`moder_sn`,
+		`mod_time`,
+		is_load_goods,
+		`tstm`
+		from mall_merch_user
+		where store_id = #{storeId} and user_id = #{userId}
+	</select>
+
+	<select id="queryMerchUserByLoadGoods" resultType="com.kmall.admin.entity.MerchUserEntity">
+		select
+		`id`,
+		`merch_sn`,
+		`store_id`,
+		`user_id`,
+		`creater_sn`,
+		`create_time`,
+		`moder_sn`,
+		`mod_time`,
+		is_load_goods,
+		`tstm`
+		from mall_merch_user
+		where store_id = #{storeId} and is_load_goods = 0
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MerchUserEntity">
+		select
+    		`id`,
+    		`merch_sn`,
+    		`store_id`,
+    		`user_id`,
+    		`creater_sn`,
+    		`create_time`,
+    		`moder_sn`,
+    		`mod_time`,
+			is_load_goods,
+    		`tstm`
+		from mall_merch_user
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mall_merch_user
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+	 
+	<insert id="save" parameterType="com.kmall.admin.entity.MerchUserEntity" useGeneratedKeys="true" keyProperty="id">
+		insert into mall_merch_user(
+			`merch_sn`,
+			`store_id`,
+			`user_id`,
+			is_load_goods,
+			`creater_sn`,
+			`create_time`,
+			`moder_sn`,
+			`mod_time`,
+			`tstm`)
+		values(
+			#{merchSn},
+			#{storeId},
+			#{userId},
+			#{isLoadGoods},
+			#{createrSn},
+			#{createTime},
+			#{moderSn},
+			#{modTime},
+			#{tstm})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.MerchUserEntity">
+		update mall_merch_user 
+		<set>
+			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
+			<if test="storeId != null">`store_id` = #{storeId}, </if>
+			<if test="userId != null">`user_id` = #{userId}, </if>
+			<if test="isLoadGoods != null">`is_load_goods` = #{isLoadGoods}, </if>
+			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+			<if test="modTime != null">`mod_time` = #{modTime}, </if>
+			<if test="tstm != null">`tstm` = #{tstm}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="delete">
+		delete from mall_merch_user where id = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from mall_merch_user where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+	<update id="updateStoreLoadGoodsById" parameterType="com.kmall.api.entity.StoreVo">
+		update mall_merch_user
+		<set>
+			<if test="isLoadGoods != null">`is_load_goods` = #{isLoadGoods}, </if>
+			mod_time = now(),
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+		</set>
+		where store_id = #{storeId}
+	</update>
+</mapper>

kmall-admin/src/main/resources/mybatis/mapper/StoreDao.xml

@@ -27,7 +27,6 @@
 		<result property="thirdPartyMerchName" column="third_party_merch_name"/>
 		<result property="exprAgreementType" column="expr_agreement_type"/>
 		<result property="isValid" column="is_valid"/>
-		<result property="isLoadGoods" column="is_load_goods"/>
 
     </resultMap>
 
@@ -44,7 +43,7 @@
 			`county_name`,
 			`latitude`,
 			`longitude`,
-			`cover_radius`,expr_agreement_type,is_load_goods,
+			`cover_radius`,expr_agreement_type,
 			`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
 		moder_sn, mod_time, tstm,is_valid
 		from mall_store
@@ -64,7 +63,7 @@
 		`county_name`,
 		`latitude`,
 		`longitude`,
-		`cover_radius`,expr_agreement_type,is_load_goods,
+		`cover_radius`,expr_agreement_type,
 		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
     moder_sn, mod_time, tstm,is_valid
 		from mall_store
@@ -104,7 +103,7 @@
 		s.`county_name`,
 		s.`latitude`,
 		s.`longitude`,
-		s.`cover_radius`,s.is_load_goods,
+		s.`cover_radius`,
 		s.`remark`,s.merch_sn, s.merch_name, s.creater_sn, s.create_time,s.third_party_merch_code,t.third_party_merch_name,s.expr_agreement_type,
 		s.moder_sn, s.mod_time, s.tstm,s.is_valid
 		from mall_store s left join third_merchant_biz t on s.third_party_merch_code = t.third_party_merch_code
@@ -180,7 +179,6 @@
 			`longitude`,
 			`cover_radius`,
 			is_valid,
-			is_load_goods,
 			`remark`,
 			third_party_merch_code,
 			third_party_merch_name,
@@ -203,7 +201,6 @@
 			#{longitude},
 			#{coverRadius},
 			#{isValid},
-			#{isLoadGoods},
 			#{remark},
 			#{thirdPartyMerchCode},
 			#{thirdPartyMerchName},
@@ -230,7 +227,6 @@
 			<if test="longitude != null">`longitude` = #{longitude}, </if>
 			<if test="coverRadius != null">`cover_radius` = #{coverRadius}, </if>
 			<if test="isValid != null">`is_valid` = #{isValid}, </if>
-			<if test="isLoadGoods != null">`is_load_goods` = #{isLoadGoods}, </if>
 			<if test="remark != null">`remark` = #{remark},</if>
 			<if test="createrSn != null" >creater_sn = #{createrSn},</if>
 			<if test="createTime != null" >create_time = #{createTime},</if>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkstorecampminus.html

@@ -518,7 +518,7 @@
                         <i-col span="3">
                             <Form-item :label-width="1">
                                 <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                        max-size="2048"
+                                        max-size="100"
                                         :on-success="handleSuccessAdvImgUrl" :on-format-error="handleFormatError"
                                         :show-upload-list="false"
                                         :on-exceeded-size="handleMaxSize">
@@ -532,6 +532,11 @@
                             </Form-item>
                         </i-col>
                     </Row>
+                    <Row>
+                        <i-col span="16" style="margin-top: -30px;">
+                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 尺寸建议410*110像素以内，大小100K以下</span>
+                        </i-col>
+                    </Row>
                     <Form-item label="活动说明" prop="advDesc">
                         <i-input type="textarea" :rows="3" v-model="mkStoreCampMinus.advDesc" placeholder="活动说明" style="width: 400px"></i-input>
                     </Form-item>

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkstoreticketdiscount.html

@@ -402,7 +402,7 @@
                         <i-col span="3">
                             <Form-item :label-width="1">
                                 <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                        max-size="2048"
+                                        max-size="100"
                                         :on-success="handleSuccessAdvImgUrl" :on-format-error="handleFormatError"
                                         :show-upload-list="false"
                                         :on-exceeded-size="handleMaxSize">
@@ -417,6 +417,11 @@
                         </i-col>
                     </Row>
                     <Row>
+                        <i-col span="16" style="margin-top: -30px;">
+                            <span style="margin-left: 100px;color: red;font-size: 12px;">* 尺寸建议410*110像素以内，大小100K以下</span>
+                        </i-col>
+                    </Row>
+                    <Row>
                         <i-col span="16">
                             <Form-item label="门店logo图url" prop="storeLogoUrl">
                                 <i-input v-model="mkStoreTicketDiscount.storeLogoUrl" placeholder="门店logo图url" readonly/>
@@ -425,7 +430,7 @@
                         <i-col span="3">
                             <Form-item :label-width="1">
                                 <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                        max-size="2048"
+                                        max-size="100"
                                         :on-success="handleSuccessStoreLogoUrl" :on-format-error="handleFormatError"
                                         :show-upload-list="false"
                                         :on-exceeded-size="handleMaxSize">
@@ -439,6 +444,11 @@
                             </Form-item>
                         </i-col>
                     </Row>
+                    <Row>
+                        <i-col span="16" style="margin-top: -30px;">
+                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 尺寸建议410*110像素以内，大小100K以下</span>
+                        </i-col>
+                    </Row>
                     <Form-item label="图片是否展示在广告栏" prop="isStoreShow">
                         <Radio-group v-model="mkStoreTicketDiscount.isStoreShow">
                             <Radio label="0">

kmall-admin/src/main/webapp/WEB-INF/page/shop/ad.html

@@ -65,7 +65,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccess" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -81,7 +81,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -20px;">
-                    <span style="margin-left: 80px;color: red;font-size: 12px;">尺寸建议750*400像素以内，大小2M以下</span>
+                    <span style="margin-left: 80px;color: red;font-size: 12px;">尺寸建议750*400像素以内，大小100K以下</span>
                 </i-col>
             </Row>
             <Form-item label="内容" prop="content">

kmall-admin/src/main/webapp/WEB-INF/page/shop/brand.html

@@ -62,7 +62,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessListPicUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -78,7 +78,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -30px;">
-                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 图片尺寸建议760*484像素以内，大小2M以下</span>
+                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 图片尺寸建议760*484像素以内，大小100k以下</span>
                 </i-col>
             </Row>
             <Form-item label="描述" prop="simpleDesc">
@@ -93,7 +93,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessPicUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -109,7 +109,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -30px;">
-                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 图片尺寸建议760*484像素以内，大小2M以下</span>
+                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 图片尺寸建议760*484像素以内，大小100k以下</span>
                 </i-col>
             </Row>
             <Form-item label="排序" prop="sortOrder">
@@ -137,7 +137,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessAppListPicUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -153,7 +153,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -30px;">
-                    <span style="margin-left: 100px;color: red;font-size: 12px;">* app显示图片尺寸建议760*484像素以内，大小2M以下</span>
+                    <span style="margin-left: 100px;color: red;font-size: 12px;">* app显示图片尺寸建议760*484像素以内，大小100k以下</span>
                 </i-col>
             </Row>
             <Form-item label="新品牌" prop="isNew">
@@ -175,7 +175,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessNewPicUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -191,7 +191,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -30px;">
-                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 新品牌图片尺寸建议760*484像素以内，大小2M以下</span>
+                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 新品牌图片尺寸建议760*484像素以内，大小100k以下</span>
                 </i-col>
             </Row>
             <Form-item label="新品牌排序" prop="newSortOrder">

kmall-admin/src/main/webapp/WEB-INF/page/shop/category.html

@@ -133,7 +133,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessIconUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -149,7 +149,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -30px;">
-                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 尺寸建议90*90像素以内，大小2M以下</span>
+                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 尺寸建议90*90像素以内，大小100K以下</span>
                 </i-col>
             </Row>
             <!--<Row>-->
@@ -189,7 +189,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessWapBannerUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -205,7 +205,7 @@
             </Row>
             <Row>
                 <i-col span="16" style="margin-top: -30px;">
-                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 一级分类图片尺寸建议720*246像素以内，二级分类图片尺寸建议250*250像素以内，大小2M以下</span>
+                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 一级分类图片尺寸建议720*246像素以内，二级分类图片尺寸建议250*250像素以内，大小100K以下</span>
                 </i-col>
             </Row>
             <!--<Form-item label="类型" prop="type">-->

kmall-admin/src/main/webapp/WEB-INF/page/shop/goods.html

@@ -243,7 +243,7 @@
                         <i-col span="4">
                             <Form-item :label-width="1">
                                 <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                        max-size="2048"
+                                        max-size="100"
                                         :on-success="handleSuccessPicUrl" :on-format-error="handleFormatError"
                                         :show-upload-list="false"
                                         :on-exceeded-size="handleMaxSize">
@@ -259,7 +259,7 @@
                     </Row>
                     <Row>
                         <i-col span="16" style="margin-top: -30px;">
-                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 尺寸建议200x200（正方形模式）像素以内，大小2M以下</span>
+                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 尺寸建议200x200（正方形模式）像素以内，大小100k以内</span>
                         </i-col>
                     </Row>
                     <Row>
@@ -271,7 +271,7 @@
                         <i-col span="4">
                             <Form-item :label-width="1">
                                 <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                        max-size="2048"
+                                        max-size="100"
                                         :on-success="handleSuccessListPicUrl" :on-format-error="handleFormatError"
                                         :show-upload-list="false"
                                         :on-exceeded-size="handleMaxSize">
@@ -287,7 +287,7 @@
                     </Row>
                     <Row>
                         <i-col span="16" style="margin-top: -30px;">
-                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 尺寸建议200x200（正方形模式）像素以内，大小2M以下</span>
+                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 尺寸建议200x200（正方形模式）像素以内，大小100k以内</span>
                         </i-col>
                     </Row>
                 <Row>
@@ -299,7 +299,7 @@
                     <i-col span="4">
                         <Form-item :label-width="1">
                             <Upload style="width: 300px;" action="../sys/oss/upload" :format="['mp4']"
-                                    max-size="2048"
+                                    max-size="1024"
                                     :on-success="handleSuccessListVideoUrl" :on-format-error="handleVideoFormatError"
                                     :show-upload-list="false"
                                     :on-exceeded-size="handleVideoMaxSize">
@@ -315,7 +315,7 @@
                 </Row>
                 <Row>
                     <i-col span="16" style="margin-top: -30px;">
-                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 视频不能超过2M，视频时限20秒内，支持mp4视频格式</span>
+                            <span style="margin-left: 140px;color: red;font-size: 12px;">* 视频不能超过1M，视频时限20秒内，支持mp4视频格式</span>
                     </i-col>
                 </Row>
                 <!--</i-form>-->
@@ -413,7 +413,7 @@
                             :default-file-list="uploadList"
                             :on-success="handleSuccess"
                             :format="['jpg','jpeg','png']"
-                            :max-size="2048"
+                            :max-size="100"
                             :on-format-error="handleFormatError"
                             :on-exceeded-size="handleMaxSize"
                             :before-upload="handleBeforeUpload"
@@ -428,7 +428,7 @@
                     <Modal title="查看图片" v-model="visible">
                         <img :src="imgName" v-if="visible" style="width: 100%"/>
                     </Modal>
-                    <span style="color: red;font-size: 12px;">* 商品详情轮播图，尺寸建议750x750（正方形模式）像素以内，大小2M以下</span>
+                    <span style="color: red;font-size: 12px;">* 商品详情轮播图，尺寸建议750x750（正方形模式）像素以内，大小100k以内</span>
                 </template>
                 <div id="goodsDesc"></div>
             </Tab-Pane>

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsgroup.html

@@ -55,7 +55,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccess" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -78,7 +78,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleAbbrSuccess" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsspecification.html

@@ -57,7 +57,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccess" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">

kmall-admin/src/main/webapp/WEB-INF/page/shop/topic.html

@@ -49,7 +49,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessAvatar" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -64,6 +64,11 @@
                 </i-col>
             </Row>
             <Row>
+                <i-col span="16" style="margin-top: -30px;">
+                    <span style="margin-left: 100px;color: red;font-size: 12px;">* 尺寸建议410*110像素以内，大小100K以下</span>
+                </i-col>
+            </Row>
+            <Row>
                 <i-col span="16">
                     <Form-item label="活动条例图片" prop="itemPicUrl">
                         <i-input v-model="topic.itemPicUrl" placeholder="活动条例图片" readonly/>
@@ -72,7 +77,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessItemPicUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">
@@ -107,7 +112,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccessScenePicUrl" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">

kmall-admin/src/main/webapp/WEB-INF/page/shop/topiccategory.html

@@ -45,7 +45,7 @@
                 <i-col span="4">
                     <Form-item :label-width="1">
                         <Upload style="width: 300px;" action="../sys/oss/upload" :format="['jpg','jpeg','png']"
-                                max-size="2048"
+                                max-size="100"
                                 :on-success="handleSuccess" :on-format-error="handleFormatError"
                                 :show-upload-list="false"
                                 :on-exceeded-size="handleMaxSize">

kmall-admin/src/main/webapp/js/mk/mkstorecampminus.js

@@ -374,7 +374,7 @@ let vm = new Vue({
             vm.isShowGoods = false;//为false则可以添加商品
             vm.showStoreGoodsList = true;
 
-            vm.reloadOrder();
+            vm.reloadOrderSearch();
         },
         queryOrder: function () {
             vm.reloadOrder();
@@ -958,7 +958,7 @@ let vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         eyeImageAdvImgUrl: function () {

kmall-admin/src/main/webapp/js/mk/mkstoreticketdiscount.js

@@ -1025,7 +1025,7 @@ let vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         eyeImageAdvImgUrl: function () {

kmall-admin/src/main/webapp/js/shop/ad.js

@@ -180,7 +180,7 @@ var vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         handleSubmit: function (name) {

kmall-admin/src/main/webapp/js/shop/brand.js

@@ -232,7 +232,7 @@ var vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100k。'
             });
         },
         eyeImageListPicUrl: function () {

kmall-admin/src/main/webapp/js/shop/category.js

@@ -230,7 +230,7 @@ var vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         handleSuccessBannerUrl: function (res, file) {

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -626,7 +626,13 @@ var vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100k。'
+            });
+        },
+        handleMaxSizeByInfo: function (file) {
+            this.$Notice.warning({
+                title: '超出文件大小限制',
+                desc: '文件 ' + file.name + ' 太大，不能超过 300k。'
             });
         },
         handleReset: function (name) {
@@ -662,7 +668,7 @@ var vm = new Vue({
         handleVideoMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 1M。'
             });
         },
         handleSuccessListVideoUrl: function (res, file) {

kmall-admin/src/main/webapp/js/shop/goodsgroup.js

@@ -205,7 +205,7 @@ let vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         handleSuccess: function (res, file) {

kmall-admin/src/main/webapp/js/shop/goodsspecification.js

@@ -158,7 +158,7 @@ var vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         handleSuccess: function (res, file) {

kmall-admin/src/main/webapp/js/shop/storeProductStock.js

@@ -588,47 +588,11 @@ var vm = new Vue({
         uploadExcelError: function () {
             alert('上传出现异常');
         },
-        handleView(name) {
-            this.imgName = name;
-            this.visible = true;
-        },
-        handleRemove(file) {
-            // 从 upload 实例删除数据
-            const fileList = this.uploadList;
-            this.uploadList.splice(fileList.indexOf(file), 1);
-        },
-        handleSuccess(res, file) {
-            // 因为上传过程为实例，这里模拟添加 url
-            file.imgUrl = res.url;
-            file.name = res.url;
-            vm.uploadList.add(file);
-        },
-        handleBeforeUpload() {
-            const check = this.uploadList.length < 5;
-            if (!check) {
-                this.$Notice.warning({
-                    title: '最多只能上传 5 张图片。'
-                });
-            }
-            return check;
-        },
         handleSubmit: function (name) {
             handleSubmitValidate(this, name, function () {
                 vm.saveOrUpdate()
             });
         },
-        handleFormatError: function (file) {
-            this.$Notice.warning({
-                title: '文件格式不正确',
-                desc: '文件 ' + file.name + ' 格式不正确，请上传 jpg 或 png 格式的图片。'
-            });
-        },
-        handleMaxSize: function (file) {
-            this.$Notice.warning({
-                title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
-            });
-        },
         handleReset: function (name) {
             handleResetForm(this, name);
         },

kmall-admin/src/main/webapp/js/shop/topic.js

@@ -178,7 +178,7 @@ var vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         eyeImageAvatar: function () {

kmall-admin/src/main/webapp/js/shop/topiccategory.js

@@ -141,7 +141,7 @@ var vm = new Vue({
         handleMaxSize: function (file) {
             this.$Notice.warning({
                 title: '超出文件大小限制',
-                desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                desc: '文件 ' + file.name + ' 太大，不能超过 100K。'
             });
         },
         eyeImage: function () {