Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

 Conflicts:

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

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

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

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

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

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

@@ -266,10 +266,7 @@ public class GoodsController {
             e.printStackTrace();
             return R.error("导入失败！");
         }
-        int result = goodsService.uploadExcel(goodsDtoList,Integer.parseInt(Dict.exportDataType.item_1.getItem()));
-        if(0 == result){
-            throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-        }
+        goodsService.uploadExcel(goodsDtoList,Integer.parseInt(Dict.exportDataType.item_1.getItem()));
         //上传文件
         return R.ok();
     }
@@ -290,10 +287,7 @@ public class GoodsController {
             e.printStackTrace();
             return R.error("导入失败！");
         }
-        int result = goodsService.uploadExcel(generalGoodsDtoList,Integer.parseInt(Dict.exportDataType.item_2.getItem()));
-        if(0 == result){
-            throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
-        }
+        goodsService.uploadExcel(generalGoodsDtoList,Integer.parseInt(Dict.exportDataType.item_2.getItem()));
         //上传文件
         return R.ok();
     }

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

@@ -3,12 +3,11 @@ package com.kmall.admin.controller;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.collect.ImmutableBiMap;
 import com.kmall.admin.entity.SysUserBizPermissionEntity;
 import com.kmall.admin.fromcomm.entity.SysUserEntity;
 import com.kmall.admin.service.SysUserBizPermissionService;
-import com.kmall.common.utils.PageUtils;
-import com.kmall.common.utils.Query;
-import com.kmall.common.utils.R;
+import com.kmall.common.utils.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -64,6 +63,15 @@ public class SysUserBizPermissionController {
     @RequiresPermissions("sysuserbizpermission:save")
     @ResponseBody
     public R save(@RequestBody SysUserBizPermissionEntity sysUserBizPermission) {
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(sysUserBizPermission);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("userId", "用户");
+        builder.put("permissionId", "权限");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
+
         sysUserBizPermissionService.save(sysUserBizPermission);
 
         return R.ok();
@@ -76,6 +84,15 @@ public class SysUserBizPermissionController {
     @RequiresPermissions("sysuserbizpermission:update")
     @ResponseBody
     public R update(@RequestBody SysUserBizPermissionEntity sysUserBizPermission) {
+        Map<String, Object> valideDate = MapBeanUtil.fromObject(sysUserBizPermission);
+        ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
+        builder.put("userId", "用户");
+        builder.put("permissionId", "权限");
+        R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
+        if (Integer.valueOf(r.get("code").toString()) != 0) {
+            throw new RRException(r.get("msg").toString());
+        }
+
         sysUserBizPermissionService.update(sysUserBizPermission);
 
         return R.ok();

kmall-admin/src/main/java/com/kmall/admin/controller/exportPDF/ExportPDFController.java

@@ -30,8 +30,8 @@ public class ExportPDFController {
     @Value("${font.url}")
     private String fontUrl;
 
-    @Value("${upload.dir}")
-    private String uploadDir;
+//    @Value("${upload.dir}")
+//    private String uploadDir;
 
 
     //打印pdf
@@ -46,7 +46,7 @@ public class ExportPDFController {
             return null;
         }
 
-
+        String uploadDir="";
         if ("1".equals(head)) {
             Map<String, Object> model = new HashMap<>();
             model.put("dto", pdfGoodsDto);

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkActivitiesController.java

@@ -64,10 +64,10 @@ public class MkActivitiesController {
     public R save(@RequestBody MkActivitiesEntity mkActivities) {
         Map<String, Object> valideDate = MapBeanUtil.fromObject(mkActivities);
         ImmutableBiMap.Builder builder = new ImmutableBiMap.Builder();
-        builder.put("mkaTopic", "活动主题");
-        builder.put("merchSn", "商户编号");
-        builder.put("thirdMerchSn", "第三方商户编号");
-        builder.put("mkaStoreId", "活动门店id");
+        builder.put("mkaTopic", "营销方式");
+        builder.put("merchSn", "商户");
+        builder.put("thirdMerchSn", "第三方商户");
+        builder.put("mkaStoreId", "活动门店");
         builder.put("mkaStartTime", "开始时间");
         builder.put("mkdEndTime", "结束时间");
         if("1".equals(mkActivities.getMkaEndEarly())){

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkActivityFormController.java

@@ -117,7 +117,7 @@ public class MkActivityFormController {
         Query query = new Query(params);
 
         List<MkActivitiesEntity> mkActivityFormList = mkActivityFormService.queryMkactivitiesList(query);
-        int total = mkActivityFormService.queryTotal(query);
+        int total = mkActivityFormService.queryMkactivitiesTotal(query);
 
         PageUtils pageUtil = new PageUtils(mkActivityFormList, total, query.getLimit(), query.getPage());
 

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

@@ -12,6 +12,8 @@ import com.kmall.admin.entity.mk.MkActivitiesEntity;
 import com.kmall.admin.service.*;
 import com.kmall.admin.service.mk.MkActivitiesService;
 import com.kmall.admin.service.mk.MkActivityFormService;
+import com.kmall.admin.service.GoodsService;
+import com.kmall.admin.utils.GoodsUtils;
 import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
 import com.kmall.common.constant.Dict;
@@ -71,6 +73,8 @@ public class GoodsServiceImpl implements GoodsService {
     private MerchUserDao merchUserDao;
     @Autowired
     private StoreMngChangeDao storeMngChangeDao;
+    @Autowired
+    private GoodsUtils goodsUtils;
 
 
     @Autowired
@@ -979,43 +983,44 @@ public class GoodsServiceImpl implements GoodsService {
             }else{
                 exportExceptionDataEntity.setExportDataType(Dict.exportDataType.item_2.getItem());
             }
+
             if(failMerchUserGoodsSnList != null && failMerchUserGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("不能操作除了登录用户以外商户的商品，当前商户编号为【"+merchSn+"】，请检查商品编码【"+failMerchUserGoodsSnList+"】的商品信息");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
             if(failMerchGoodsSnList != null && failMerchGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("第三方商户代码不存在，请在商城配置》第三方商户管理中维护，请检查商品编码【"+failMerchGoodsSnList+"】的商品信息，请先维护再继续操作！");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
             if(failGoodsSnList != null && failGoodsSnList.size() > 0){
                 if(failSameSkuList.size()>0) {
                     exportExceptionDataEntity.setExportExceptionData("不能有重复的商品编码、sku信息！请检查商品编码【" + failGoodsSnList + "】，业务类型【" +
                             failGoodsTypeList + "】，SKU【" + failSameSkuList + "】的商品信息");
-                    exportExceptionDataDao.save(exportExceptionDataEntity);
-                    return 0;
+                    goodsUtils.save(exportExceptionDataEntity);
+                    throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
                 }else{
                     exportExceptionDataEntity.setExportExceptionData("不能有重复的商品编码、sku信息！请检查商品编码【" + failGoodsSnList + "】，业务类型【" +
                             failGoodsTypeList + "】的商品信息");
-                    exportExceptionDataDao.save(exportExceptionDataEntity);
-                    return 0;
+                    goodsUtils.save(exportExceptionDataEntity);
+                    throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
                 }
             }
             if(failTypeGoodsSnList != null && failTypeGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("货品业务类型只能是【00保税备货、02保税补货、10保税展示】！请检查商品编码【"+failTypeGoodsSnList+"】的商品信息");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
             if(failProdbarGoodsSnList != null && failProdbarGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("不能有重复的产品条码信息！请检查商品编码【"+failProdbarGoodsSnList+"】的商品产品条码信息");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
             if(failHotGoodsSnList != null && failHotGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("请检查业务类型为【保税补货或保税展示】的商品，商品编码【"+failHotGoodsSnList+"】的商品不能设置为热销！");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
 //            if(failCateGoodsSnList != null && failCateGoodsSnList.size() > 0){
 //                exportExceptionDataEntity.setExportExceptionData("分类信息请在商城配置》商品分类中维护，商品分类与商户信息对应，请检查该商品商户信息下的分类是否维护，不存在的商品编码【"+failCateGoodsSnList+"】");
@@ -1039,18 +1044,18 @@ public class GoodsServiceImpl implements GoodsService {
 //            }
             if(failSuppGoodsSnList != null && failSuppGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("供应商信息请在商城配置》商品供应商中维护，供应商与商户信息对应，请检查该商品商户信息下的供应商是否维护，不存在的商品编码【" + failSuppGoodsSnList + "】");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
             if(failUnitGoodsSnList != null && failUnitGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("计算单位信息请在商城配置》计算单位中维护，不存在的商品编码【" + failUnitGoodsSnList + "】");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
             if(failNationGoodsSnList != null && failNationGoodsSnList.size() > 0){
                 exportExceptionDataEntity.setExportExceptionData("原产国信息请在商城配置》原产国中维护，不存在的商品编码【" + failNationGoodsSnList + "】");
-                exportExceptionDataDao.save(exportExceptionDataEntity);
-                return 0;
+                goodsUtils.save(exportExceptionDataEntity);
+                throw new RRException("导入数据异常，异常信息请在商品管理》》商品导入异常数据中查看检查");
             }
         }else{
             throw new RRException("导入数据为空，或者检查商品编码数据是否为空");

kmall-admin/src/main/java/com/kmall/admin/utils/TestUtils.java → kmall-admin/src/main/java/com/kmall/admin/utils/GoodsUtils.java

@@ -3,6 +3,7 @@ package com.kmall.admin.utils;
 import com.kmall.admin.dao.ExportExceptionDataDao;
 import com.kmall.admin.entity.ExportExceptionDataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11,7 +12,8 @@ import org.springframework.transaction.annotation.Transactional;
  * @version 1.0.0
  * 2020/9/18
  */
-public class TestUtils {
+@Component
+public class GoodsUtils {
 
     @Autowired
     private ExportExceptionDataDao exportExceptionDataDao;

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite.java

@@ -24,7 +24,7 @@ public class PDFWrite {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_12.java

@@ -22,7 +22,7 @@ public class PDFWrite_12 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_18.java

@@ -23,7 +23,7 @@ public class PDFWrite_18 {
         com.lowagie.text.Font FontChinese11 = new com.lowagie.text.Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_2.java

@@ -21,7 +21,7 @@ public class PDFWrite_2 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_36.java

@@ -23,7 +23,7 @@ public class PDFWrite_36 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_4.java

@@ -21,7 +21,7 @@ public class PDFWrite_4 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_9.java

@@ -22,7 +22,7 @@ public class PDFWrite_9 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
         doc.setMargins(0,0,0,0);
 

kmall-admin/src/main/java/com/kmall/admin/utils/pdf/type/PDFWrite_nohead_36.java

@@ -29,7 +29,7 @@ public class PDFWrite_nohead_36 {
         Font FontChinese11 = new Font(bfHei, 11);
 
         String path = uploadDir;
-        FileOutputStream out = new FileOutputStream(path);
+//        FileOutputStream out = new FileOutputStream(path);
 
 
         writer.setPdfVersion(PdfWriter.PDF_VERSION_1_2);//版本(默认1.4)

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

@@ -35,7 +35,7 @@
 		from sys_biz_permission
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND permission_name LIKE concat('%',#{name},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -54,7 +54,7 @@
 		select count(*) from sys_biz_permission
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND permission_name LIKE concat('%',#{name},'%')
         </if>
 	</select>
 	 

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

@@ -28,7 +28,7 @@
 		left join sys_biz_permission p2  on p.permission_id = p2.permission_id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+			AND userName LIKE concat('%',#{name},'%')
 		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
@@ -44,10 +44,11 @@
 	</select>
 	
  	<select id="queryTotal" resultType="int">
-		select count(*) from sys_user_biz_permission
+		select count(*) from sys_user_biz_permission p
+		left join sys_user u on p.user_id = u.user_id
 		WHERE 1=1
         <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
+            AND u.username LIKE concat('%',#{name},'%')
         </if>
 	</select>
 	 

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

@@ -53,18 +53,6 @@
             <Form-item label="截止日期" prop="deadline">
                 <i-input v-model="mkActivitiesCombinationPrice.deadline" placeholder="截止日期"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesCombinationPrice.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesCombinationPrice.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesCombinationPrice.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesCombinationPrice.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -56,18 +56,6 @@
             <Form-item label="截止日期" prop="deadline">
                 <i-input v-model="mkActivitiesCoupon.deadline" placeholder="截止日期"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesCoupon.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesCoupon.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesCoupon.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesCoupon.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -62,18 +62,6 @@
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkActivitiesDiscount.mkaId" placeholder="营销活动编号"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesDiscount.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesDiscount.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesDiscount.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesDiscount.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -65,18 +65,6 @@
             <Form-item label="截止日期" prop="deadline">
                 <i-input v-model="mkActivitiesFullGift.deadline" placeholder="截止日期"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesFullGift.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesFullGift.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesFullGift.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesFullGift.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -65,18 +65,6 @@
             <Form-item label="截止日期" prop="deadline">
                 <i-input v-model="mkActivitiesFullReduction.deadline" placeholder="截止日期"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesFullReduction.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesFullReduction.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesFullReduction.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesFullReduction.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -62,18 +62,6 @@
             <Form-item label="截止日期" prop="deadline">
                 <i-input v-model="mkActivitiesPromotion.deadline" placeholder="截止日期"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesPromotion.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesPromotion.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesPromotion.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesPromotion.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -62,18 +62,6 @@
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkDailyActivities.mkaId" placeholder="营销活动编号"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkDailyActivities.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkDailyActivities.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkDailyActivities.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkDailyActivities.updateTime" placeholder="修改时间"/>
-            </Form-item>
             <Form-item>
                 <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
                 <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>

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

@@ -28,8 +28,9 @@ $(function () {
 			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
 			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}
-			],
+			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
+			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}],
 		viewrecords: true,
 		postData: {'mkaId': vm.mkaId},
         height: 550,

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

@@ -84,9 +84,9 @@ let vm = new Vue({
                 return;
             }
 
-            window.open("../pdf/printPdf?type="+vm.q.pdfType+"&sku="+vm.q.sku+"&barCode="+vm.q.barCode+"&head="+vm.q.isHead+"&headUrl="+vm.q.headUrl+"&storeId="+vm.q.storeId);
+            window.open("../pdf/printPdf?type="+vm.q.pdfType+"&sku="+vm.q.sku+"&prodBarcode="+vm.q.barCode+"&head="+vm.q.isHead+"&headUrl="+vm.q.headUrl+"&storeId="+vm.q.storeId);
 
-            $.get("../pdf/printPdf?type="+vm.q.pdfType+"&sku="+vm.q.sku+"&barCode="+vm.q.barCode+"&head="+vm.q.isHead+"&headUrl="+vm.q.headUrl+"&storeId="+vm.q.storeId, function (r) {
+            $.get("../pdf/printPdf?type="+vm.q.pdfType+"&sku="+vm.q.sku+"&prodBarcode="+vm.q.barCode+"&head="+vm.q.isHead+"&headUrl="+vm.q.headUrl+"&storeId="+vm.q.storeId, function (r) {
                 console.log(r)
                 alert(r)
             });

kmall-manager/src/main/resources/conf/print.properties

@@ -1,2 +1,2 @@
 font.url=/static/font/ams1015.ttf
-upload.dir=E:/demo/code_1.pdf
+#upload.dir=E:/demo/code_1.pdf