Merge branch 'master' of lsp/kmall-pt-general into master

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

@@ -30,7 +30,7 @@ public class MkActivitiesCouponController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiescoupon:list")
+//    @RequiresPermissions("mkactivitiescoupon:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -48,7 +48,7 @@ public class MkActivitiesCouponController {
      * 查看信息
      */
     @RequestMapping("/info/{macId}")
-    @RequiresPermissions("mkactivitiescoupon:info")
+//    @RequiresPermissions("mkactivitiescoupon:info")
     @ResponseBody
     public R info(@PathVariable("macId") Long macId) {
         MkActivitiesCouponEntity mkActivitiesCoupon = mkActivitiesCouponService.queryObject(macId);
@@ -60,7 +60,7 @@ public class MkActivitiesCouponController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiescoupon:save")
+//    @RequiresPermissions("mkactivitiescoupon:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesCouponEntity mkActivitiesCoupon) {
         mkActivitiesCouponService.save(mkActivitiesCoupon);
@@ -72,7 +72,7 @@ public class MkActivitiesCouponController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiescoupon:update")
+//    @RequiresPermissions("mkactivitiescoupon:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesCouponEntity mkActivitiesCoupon) {
         mkActivitiesCouponService.update(mkActivitiesCoupon);
@@ -84,7 +84,7 @@ public class MkActivitiesCouponController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiescoupon:delete")
+//    @RequiresPermissions("mkactivitiescoupon:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]macIds) {
         mkActivitiesCouponService.deleteBatch(macIds);

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

@@ -31,7 +31,7 @@ public class MkActivitiesFullReductionController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesfullreduction:list")
+//    @RequiresPermissions("mkactivitiesfullreduction:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +49,7 @@ public class MkActivitiesFullReductionController {
      * 查看信息
      */
     @RequestMapping("/info/{mafrId}")
-    @RequiresPermissions("mkactivitiesfullreduction:info")
+//    @RequiresPermissions("mkactivitiesfullreduction:info")
     @ResponseBody
     public R info(@PathVariable("mafrId") Long mafrId) {
         MkActivitiesFullReductionEntity mkActivitiesFullReduction = mkActivitiesFullReductionService.queryObject(mafrId);
@@ -61,7 +61,7 @@ public class MkActivitiesFullReductionController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesfullreduction:save")
+//    @RequiresPermissions("mkactivitiesfullreduction:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
         mkActivitiesFullReductionService.save(mkActivitiesFullReduction);
@@ -73,7 +73,7 @@ public class MkActivitiesFullReductionController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesfullreduction:update")
+//    @RequiresPermissions("mkactivitiesfullreduction:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
         mkActivitiesFullReductionService.update(mkActivitiesFullReduction);
@@ -85,7 +85,7 @@ public class MkActivitiesFullReductionController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesfullreduction:delete")
+//    @RequiresPermissions("mkactivitiesfullreduction:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mafrIds) {
         mkActivitiesFullReductionService.deleteBatch(mafrIds);

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

@@ -31,7 +31,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:list")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +49,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 查看信息
      */
     @RequestMapping("/info/{mkaFreeId}")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:info")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:info")
     @ResponseBody
     public R info(@PathVariable("mkaFreeId") Long mkaFreeId) {
         MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods = mkActivitiesGetOneFreeGoodsService.queryObject(mkaFreeId);
@@ -61,7 +61,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:save")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
         mkActivitiesGetOneFreeGoodsService.save(mkActivitiesGetOneFreeGoods);
@@ -73,7 +73,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:update")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
         mkActivitiesGetOneFreeGoodsService.update(mkActivitiesGetOneFreeGoods);
@@ -85,7 +85,7 @@ public class MkActivitiesGetOneFreeGoodsController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiesgetonefreegoods:delete")
+//    @RequiresPermissions("mkactivitiesgetonefreegoods:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mkaFreeIds) {
         mkActivitiesGetOneFreeGoodsService.deleteBatch(mkaFreeIds);

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

@@ -31,7 +31,7 @@ public class MkActivitiesPromotionController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkactivitiespromotion:list")
+//    @RequiresPermissions("mkactivitiespromotion:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -49,7 +49,7 @@ public class MkActivitiesPromotionController {
      * 查看信息
      */
     @RequestMapping("/info/{mapId}")
-    @RequiresPermissions("mkactivitiespromotion:info")
+//    @RequiresPermissions("mkactivitiespromotion:info")
     @ResponseBody
     public R info(@PathVariable("mapId") Long mapId) {
         MkActivitiesPromotionEntity mkActivitiesPromotion = mkActivitiesPromotionService.queryObject(mapId);
@@ -61,7 +61,7 @@ public class MkActivitiesPromotionController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkactivitiespromotion:save")
+//    @RequiresPermissions("mkactivitiespromotion:save")
     @ResponseBody
     public R save(@RequestBody MkActivitiesPromotionEntity mkActivitiesPromotion) {
         mkActivitiesPromotionService.save(mkActivitiesPromotion);
@@ -73,7 +73,7 @@ public class MkActivitiesPromotionController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkactivitiespromotion:update")
+//    @RequiresPermissions("mkactivitiespromotion:update")
     @ResponseBody
     public R update(@RequestBody MkActivitiesPromotionEntity mkActivitiesPromotion) {
         mkActivitiesPromotionService.update(mkActivitiesPromotion);
@@ -85,7 +85,7 @@ public class MkActivitiesPromotionController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkactivitiespromotion:delete")
+//    @RequiresPermissions("mkactivitiespromotion:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mapIds) {
         mkActivitiesPromotionService.deleteBatch(mapIds);

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

@@ -30,7 +30,7 @@ public class MkDailyActivitiesController {
      * 查看列表
      */
     @RequestMapping("/list")
-    @RequiresPermissions("mkdailyactivities:list")
+//    @RequiresPermissions("mkdailyactivities:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
         //查询列表数据
@@ -48,7 +48,7 @@ public class MkDailyActivitiesController {
      * 查看信息
      */
     @RequestMapping("/info/{mdaId}")
-    @RequiresPermissions("mkdailyactivities:info")
+//    @RequiresPermissions("mkdailyactivities:info")
     @ResponseBody
     public R info(@PathVariable("mdaId") Long mdaId) {
         MkDailyActivitiesEntity mkDailyActivities = mkDailyActivitiesService.queryObject(mdaId);
@@ -60,7 +60,7 @@ public class MkDailyActivitiesController {
      * 保存
      */
     @RequestMapping("/save")
-    @RequiresPermissions("mkdailyactivities:save")
+//    @RequiresPermissions("mkdailyactivities:save")
     @ResponseBody
     public R save(@RequestBody MkDailyActivitiesEntity mkDailyActivities) {
         mkDailyActivitiesService.save(mkDailyActivities);
@@ -72,7 +72,7 @@ public class MkDailyActivitiesController {
      * 修改
      */
     @RequestMapping("/update")
-    @RequiresPermissions("mkdailyactivities:update")
+//    @RequiresPermissions("mkdailyactivities:update")
     @ResponseBody
     public R update(@RequestBody MkDailyActivitiesEntity mkDailyActivities) {
         mkDailyActivitiesService.update(mkDailyActivities);
@@ -84,7 +84,7 @@ public class MkDailyActivitiesController {
      * 删除
      */
     @RequestMapping("/delete")
-    @RequiresPermissions("mkdailyactivities:delete")
+//    @RequiresPermissions("mkdailyactivities:delete")
     @ResponseBody
     public R delete(@RequestBody Long[]mdaIds) {
         mkDailyActivitiesService.deleteBatch(mdaIds);

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/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/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/mkactivitiesgetonefreegoods.html

@@ -69,18 +69,6 @@
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkActivitiesGetOneFreeGoods.mkaId" placeholder="营销活动编号"/>
             </Form-item>
-            <Form-item label="创建时间" prop="createTime">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.createTime" placeholder="创建时间"/>
-            </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.createrSn" placeholder="创建人编号"/>
-            </Form-item>
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.moderSn" placeholder="修改人编号"/>
-            </Form-item>
-            <Form-item label="修改时间" prop="updateTime">
-                <i-input v-model="mkActivitiesGetOneFreeGoods.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/mkactivitiescombinationprice.js

@@ -9,11 +9,7 @@ $(function () {
 			{label: '组合的产品数量', name: 'combinationNum', index: 'combination_num', width: 80},
 			{label: '组合价', name: 'combinedPrice', index: 'combined_price', width: 80},
 			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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

@@ -10,11 +10,7 @@ $(function () {
 			{label: '优惠券码', name: 'couponSn', index: 'coupon_sn', width: 80},
 			{label: '优惠金额', name: 'couponPrice', index: 'coupon_price', width: 80},
 			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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

@@ -12,11 +12,7 @@ $(function () {
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{label: '折扣', name: 'discount', index: 'discount', width: 80},
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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

@@ -13,11 +13,7 @@ $(function () {
 			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80},
 			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80},
 			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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

@@ -13,11 +13,7 @@ $(function () {
 			{label: '满足条件金额', name: 'qualifiedAmount', index: 'qualified_amount', width: 80},
 			{label: '减扣金额', name: 'deductionAmount', index: 'deduction_amount', width: 80},
 			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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

@@ -14,11 +14,7 @@ $(function () {
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', width: 80},
-			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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

@@ -12,11 +12,7 @@ $(function () {
 			{label: '商品品牌', name: 'productBrand', index: 'product_brand', width: 80},
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
-			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '截止日期', name: 'deadline', index: 'deadline', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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

@@ -12,11 +12,7 @@ $(function () {
 			{label: '条形码', name: 'barcode', index: 'barcode', 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},
-			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
-			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
-			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
-			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80}],
 		viewrecords: true,
         height: 550,
         rowNum: 10,

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)
             });