Merge 代码

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

@@ -3,6 +3,8 @@ package com.kmall.admin.controller;
 import java.util.List;
 import java.util.Map;
 
+import com.kmall.admin.entity.MkActivitiesCombinationPriceEntity;
+import com.kmall.admin.service.MkActivitiesCombinationPriceService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
@@ -11,15 +13,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.kmall.admin.entity.MkActivitiesCombinationPriceEntity;
-import com.kmall.admin.service.MkActivitiesCombinationPriceService;
 
 /**
  * 营销活动-组合价Controller
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Controller
 @RequestMapping("mkactivitiescombinationprice")

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

@@ -0,0 +1,106 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
+import com.kmall.admin.service.MkActivitiesCouponService;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+/**
+ * 营销活动-优惠券Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+@Controller
+@RequestMapping("mkactivitiescoupon")
+public class MkActivitiesCouponController {
+    @Autowired
+    private MkActivitiesCouponService mkActivitiesCouponService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiescoupon:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesCouponEntity> mkActivitiesCouponList = mkActivitiesCouponService.queryList(query);
+        int total = mkActivitiesCouponService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesCouponList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{macId}")
+    @RequiresPermissions("mkactivitiescoupon:info")
+    @ResponseBody
+    public R info(@PathVariable("macId") Long macId) {
+        MkActivitiesCouponEntity mkActivitiesCoupon = mkActivitiesCouponService.queryObject(macId);
+
+        return R.ok().put("mkActivitiesCoupon", mkActivitiesCoupon);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiescoupon:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesCouponEntity mkActivitiesCoupon) {
+        mkActivitiesCouponService.save(mkActivitiesCoupon);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiescoupon:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesCouponEntity mkActivitiesCoupon) {
+        mkActivitiesCouponService.update(mkActivitiesCoupon);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiescoupon:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]macIds) {
+        mkActivitiesCouponService.deleteBatch(macIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesCouponEntity> list = mkActivitiesCouponService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

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

@@ -19,7 +19,7 @@ import com.kmall.common.utils.R;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Controller
 @RequestMapping("mkactivitiesdiscount")

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

@@ -19,7 +19,7 @@ import com.kmall.common.utils.R;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Controller
 @RequestMapping("mkactivitiesfullgift")

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

@@ -15,13 +15,11 @@ import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
 
 /**
- * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
-活动方式
-满减，满xxx元立减xx元（xController
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已活动方式满减，满xxx元立减xx元（xController
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Controller
 @RequestMapping("mkactivitiesfullreduction")

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

@@ -14,14 +14,12 @@ import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
 /**
- * 买一送一商品配置表
-
-说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
-                                                     -&#Controller
+ * 营销活动--买一送
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空Controller
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Controller
 @RequestMapping("mkactivitiesgetonefreegoods")

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

@@ -0,0 +1,107 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import com.kmall.admin.entity.MkActivitiesPromotionEntity;
+import com.kmall.admin.service.MkActivitiesPromotionService;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+
+/**
+ * 营销活动-临时促销Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:25
+ */
+@Controller
+@RequestMapping("mkactivitiespromotion")
+public class MkActivitiesPromotionController {
+    @Autowired
+    private MkActivitiesPromotionService mkActivitiesPromotionService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiespromotion:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesPromotionEntity> mkActivitiesPromotionList = mkActivitiesPromotionService.queryList(query);
+        int total = mkActivitiesPromotionService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesPromotionList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{mapId}")
+    @RequiresPermissions("mkactivitiespromotion:info")
+    @ResponseBody
+    public R info(@PathVariable("mapId") Long mapId) {
+        MkActivitiesPromotionEntity mkActivitiesPromotion = mkActivitiesPromotionService.queryObject(mapId);
+
+        return R.ok().put("mkActivitiesPromotion", mkActivitiesPromotion);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiespromotion:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesPromotionEntity mkActivitiesPromotion) {
+        mkActivitiesPromotionService.save(mkActivitiesPromotion);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiespromotion:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesPromotionEntity mkActivitiesPromotion) {
+        mkActivitiesPromotionService.update(mkActivitiesPromotion);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiespromotion:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]mapIds) {
+        mkActivitiesPromotionService.deleteBatch(mapIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesPromotionEntity> list = mkActivitiesPromotionService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import com.kmall.admin.entity.MkDailyActivitiesEntity;
+import com.kmall.admin.service.MkDailyActivitiesService;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+/**
+ * 营销活动-日常活动Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+@Controller
+@RequestMapping("mkdailyactivities")
+public class MkDailyActivitiesController {
+    @Autowired
+    private MkDailyActivitiesService mkDailyActivitiesService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkdailyactivities:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkDailyActivitiesEntity> mkDailyActivitiesList = mkDailyActivitiesService.queryList(query);
+        int total = mkDailyActivitiesService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkDailyActivitiesList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{mdaId}")
+    @RequiresPermissions("mkdailyactivities:info")
+    @ResponseBody
+    public R info(@PathVariable("mdaId") Long mdaId) {
+        MkDailyActivitiesEntity mkDailyActivities = mkDailyActivitiesService.queryObject(mdaId);
+
+        return R.ok().put("mkDailyActivities", mkDailyActivities);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkdailyactivities:save")
+    @ResponseBody
+    public R save(@RequestBody MkDailyActivitiesEntity mkDailyActivities) {
+        mkDailyActivitiesService.save(mkDailyActivities);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkdailyactivities:update")
+    @ResponseBody
+    public R update(@RequestBody MkDailyActivitiesEntity mkDailyActivities) {
+        mkDailyActivitiesService.update(mkDailyActivities);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkdailyactivities:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]mdaIds) {
+        mkDailyActivitiesService.deleteBatch(mdaIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkDailyActivitiesEntity> list = mkDailyActivitiesService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

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

@@ -3,14 +3,17 @@ package com.kmall.admin.controller.exportPDF;
 import com.kmall.admin.service.GoodsService;
 import com.kmall.admin.utils.pdf.ViewPDF;
 import com.kmall.api.entity.exportpdf.PDFGoodsDto;
+import org.apache.http.HttpResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.annotation.Resource;
-import java.util.*;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhangchuangbiao
@@ -33,18 +36,25 @@ public class ExportPDFController {
 
     //打印pdf
     @RequestMapping("/printPdf")
-    public ModelAndView printPdf(String head ,String type,String sku,String storeId,String headUrl,String prodBarcode) throws Exception {
+    public ModelAndView printPdf(String head , String type, String sku, String storeId, String headUrl, String prodBarcode, HttpServletResponse response) throws Exception {
 
-        PDFGoodsDto pdfGoodsDto = goodsService.queryForPDFData(sku,storeId,prodBarcode);
+        PDFGoodsDto pdfGoodsDto = goodsService.queryForPDFData(sku, storeId, prodBarcode);
+        if (Objects.isNull(pdfGoodsDto)) {
+            response.setContentType("text/html;charset=utf-8");
+            response.getWriter().write("<script>alert('该条件有误，请重新输入');</script>");
+            response.getWriter().flush();
+            return null;
+        }
 
-        if("1".equals(head)){
+
+        if ("1".equals(head)) {
             Map<String, Object> model = new HashMap<>();
             model.put("dto", pdfGoodsDto);
-            model.put("type",type);
-            model.put("head",head);
-            model.put("fontUrl",fontUrl);
-            model.put("uploadDir",uploadDir);
-            model.put("headUrl",headUrl);
+            model.put("type", type);
+            model.put("head", head);
+            model.put("fontUrl", fontUrl);
+            model.put("uploadDir", uploadDir);
+            model.put("headUrl", headUrl);
             return new ModelAndView(new ViewPDF(), model);
         }else if ("0".equals(head)){
             Map<String, Object> model = new HashMap<>();

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

@@ -8,7 +8,7 @@ import com.kmall.manager.dao.BaseDao;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesCombinationPriceDao extends BaseDao<MkActivitiesCombinationPriceEntity> {
 

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

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 营销活动-优惠券Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+public interface MkActivitiesCouponDao extends BaseDao<MkActivitiesCouponEntity> {
+
+}

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

@@ -1,5 +1,6 @@
 package com.kmall.admin.dao;
 
+
 import com.kmall.admin.entity.MkActivitiesDiscountEntity;
 import com.kmall.manager.dao.BaseDao;
 
@@ -8,7 +9,7 @@ import com.kmall.manager.dao.BaseDao;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesDiscountDao extends BaseDao<MkActivitiesDiscountEntity> {
 

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

@@ -1,5 +1,6 @@
 package com.kmall.admin.dao;
 
+
 import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
 import com.kmall.manager.dao.BaseDao;
 
@@ -8,7 +9,7 @@ import com.kmall.manager.dao.BaseDao;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesFullGiftDao extends BaseDao<MkActivitiesFullGiftEntity> {
 

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

@@ -1,16 +1,15 @@
 package com.kmall.admin.dao;
 
+
 import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
 import com.kmall.manager.dao.BaseDao;
 
 /**
- * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
-活动方式
-满减，满xxx元立减xx元（xDao
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已活动方式满减，满xxx元立减xx元（xDao
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesFullReductionDao extends BaseDao<MkActivitiesFullReductionEntity> {
 

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

@@ -1,17 +1,16 @@
 package com.kmall.admin.dao;
 
+
 import com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity;
 import com.kmall.manager.dao.BaseDao;
 
 /**
- * 买一送一商品配置表
-
-说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
-                                                     -&#Dao
+ * 营销活动--买一送
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空Dao
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesGetOneFreeGoodsDao extends BaseDao<MkActivitiesGetOneFreeGoodsEntity> {
 

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

@@ -0,0 +1,16 @@
+package com.kmall.admin.dao;
+
+
+import com.kmall.admin.entity.MkActivitiesPromotionEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 营销活动-临时促销Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:25
+ */
+public interface MkActivitiesPromotionDao extends BaseDao<MkActivitiesPromotionEntity> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.kmall.admin.dao;
+
+
+import com.kmall.admin.entity.MkDailyActivitiesEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 营销活动-日常活动Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+public interface MkDailyActivitiesDao extends BaseDao<MkDailyActivitiesEntity> {
+
+}

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

@@ -10,7 +10,7 @@ import java.util.Date;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public class MkActivitiesCombinationPriceEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -20,10 +20,6 @@ public class MkActivitiesCombinationPriceEntity implements Serializable {
      */
     private Long macpId;
     /**
-     * 组合条码
-     */
-    private String combinationBarcode;
-    /**
      * 商品编码
      */
     private String goodsSn;
@@ -36,10 +32,6 @@ public class MkActivitiesCombinationPriceEntity implements Serializable {
      */
     private String combinationNum;
     /**
-     * 产品中文名
-     */
-    private String productName;
-    /**
      * 组合价
      */
     private BigDecimal combinedPrice;
@@ -48,6 +40,10 @@ public class MkActivitiesCombinationPriceEntity implements Serializable {
      */
     private Long mkaId;
     /**
+     * 截止日期
+     */
+    private String deadline;
+    /**
      * 创建时间
      */
     private Date createTime;
@@ -78,19 +74,6 @@ public class MkActivitiesCombinationPriceEntity implements Serializable {
         return macpId;
     }
     /**
-     * 设置：组合条码
-     */
-    public void setCombinationBarcode(String combinationBarcode) {
-        this.combinationBarcode = combinationBarcode;
-    }
-
-    /**
-     * 获取：组合条码
-     */
-    public String getCombinationBarcode() {
-        return combinationBarcode;
-    }
-    /**
      * 设置：商品编码
      */
     public void setGoodsSn(String goodsSn) {
@@ -130,19 +113,6 @@ public class MkActivitiesCombinationPriceEntity implements Serializable {
         return combinationNum;
     }
     /**
-     * 设置：产品中文名
-     */
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    /**
-     * 获取：产品中文名
-     */
-    public String getProductName() {
-        return productName;
-    }
-    /**
      * 设置：组合价
      */
     public void setCombinedPrice(BigDecimal combinedPrice) {
@@ -169,6 +139,19 @@ public class MkActivitiesCombinationPriceEntity implements Serializable {
         return mkaId;
     }
     /**
+     * 设置：截止日期
+     */
+    public void setDeadline(String deadline) {
+        this.deadline = deadline;
+    }
+
+    /**
+     * 获取：截止日期
+     */
+    public String getDeadline() {
+        return deadline;
+    }
+    /**
      * 设置：创建时间
      */
     public void setCreateTime(Date createTime) {

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

@@ -0,0 +1,223 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 营销活动-优惠券实体
+ * 表名 mk_activities_coupon
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+public class MkActivitiesCouponEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long macId;
+    /**
+     * 适用商品编号
+     */
+    private String goodsSn;
+    /**
+     * 适用商品条码
+     */
+    private String barcode;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 优惠券码
+     */
+    private String couponSn;
+    /**
+     * 优惠金额
+     */
+    private BigDecimal couponPrice;
+    /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 截止日期
+     */
+    private String deadline;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMacId(Long macId) {
+        this.macId = macId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMacId() {
+        return macId;
+    }
+    /**
+     * 设置：适用商品编号
+     */
+    public void setGoodsSn(String goodsSn) {
+        this.goodsSn = goodsSn;
+    }
+
+    /**
+     * 获取：适用商品编号
+     */
+    public String getGoodsSn() {
+        return goodsSn;
+    }
+    /**
+     * 设置：适用商品条码
+     */
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    /**
+     * 获取：适用商品条码
+     */
+    public String getBarcode() {
+        return barcode;
+    }
+    /**
+     * 设置：门店编号
+     */
+    public void setShopSn(String shopSn) {
+        this.shopSn = shopSn;
+    }
+
+    /**
+     * 获取：门店编号
+     */
+    public String getShopSn() {
+        return shopSn;
+    }
+    /**
+     * 设置：优惠券码
+     */
+    public void setCouponSn(String couponSn) {
+        this.couponSn = couponSn;
+    }
+
+    /**
+     * 获取：优惠券码
+     */
+    public String getCouponSn() {
+        return couponSn;
+    }
+    /**
+     * 设置：优惠金额
+     */
+    public void setCouponPrice(BigDecimal couponPrice) {
+        this.couponPrice = couponPrice;
+    }
+
+    /**
+     * 获取：优惠金额
+     */
+    public BigDecimal getCouponPrice() {
+        return couponPrice;
+    }
+    /**
+     * 设置：营销活动编号
+     */
+    public void setMkaId(Long mkaId) {
+        this.mkaId = mkaId;
+    }
+
+    /**
+     * 获取：营销活动编号
+     */
+    public Long getMkaId() {
+        return mkaId;
+    }
+    /**
+     * 设置：截止日期
+     */
+    public void setDeadline(String deadline) {
+        this.deadline = deadline;
+    }
+
+    /**
+     * 获取：截止日期
+     */
+    public String getDeadline() {
+        return deadline;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：创建人编号
+     */
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    /**
+     * 获取：创建人编号
+     */
+    public String getCreaterSn() {
+        return createrSn;
+    }
+    /**
+     * 设置：修改人编号
+     */
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    /**
+     * 获取：修改人编号
+     */
+    public String getModerSn() {
+        return moderSn;
+    }
+    /**
+     * 设置：修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+}

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

@@ -10,7 +10,7 @@ import java.util.Date;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public class MkActivitiesDiscountEntity implements Serializable {
     private static final long serialVersionUID = 1L;

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

@@ -10,7 +10,7 @@ import java.util.Date;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public class MkActivitiesFullGiftEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -52,6 +52,14 @@ public class MkActivitiesFullGiftEntity implements Serializable {
      */
     private String giftBarcode;
     /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 截止日期
+     */
+    private String deadline;
+    /**
      * 创建时间
      */
     private Date createTime;
@@ -186,6 +194,32 @@ public class MkActivitiesFullGiftEntity implements Serializable {
         return giftBarcode;
     }
     /**
+     * 设置：营销活动编号
+     */
+    public void setMkaId(Long mkaId) {
+        this.mkaId = mkaId;
+    }
+
+    /**
+     * 获取：营销活动编号
+     */
+    public Long getMkaId() {
+        return mkaId;
+    }
+    /**
+     * 设置：截止日期
+     */
+    public void setDeadline(String deadline) {
+        this.deadline = deadline;
+    }
+
+    /**
+     * 获取：截止日期
+     */
+    public String getDeadline() {
+        return deadline;
+    }
+    /**
      * 设置：创建时间
      */
     public void setCreateTime(Date createTime) {

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

@@ -5,14 +5,12 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
-活动方式
-满减，满xxx元立减xx元（x实体
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已活动方式满减，满xxx元立减xx元（x实体
  * 表名 mk_activities_full_reduction
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public class MkActivitiesFullReductionEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -54,6 +52,14 @@ public class MkActivitiesFullReductionEntity implements Serializable {
      */
     private BigDecimal deductionAmount;
     /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 截止日期
+     */
+    private String deadline;
+    /**
      * 创建时间
      */
     private Date createTime;
@@ -188,6 +194,32 @@ public class MkActivitiesFullReductionEntity implements Serializable {
         return deductionAmount;
     }
     /**
+     * 设置：营销活动编号
+     */
+    public void setMkaId(Long mkaId) {
+        this.mkaId = mkaId;
+    }
+
+    /**
+     * 获取：营销活动编号
+     */
+    public Long getMkaId() {
+        return mkaId;
+    }
+    /**
+     * 设置：截止日期
+     */
+    public void setDeadline(String deadline) {
+        this.deadline = deadline;
+    }
+
+    /**
+     * 获取：截止日期
+     */
+    public String getDeadline() {
+        return deadline;
+    }
+    /**
      * 设置：创建时间
      */
     public void setCreateTime(Date createTime) {

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

@@ -5,15 +5,13 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 买一送一商品配置表
-
-说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
-                                                     -&#实体
+ * 营销活动--买一送
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空实体
  * 表名 mk_activities_get_one_free_goods
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public class MkActivitiesGetOneFreeGoodsEntity implements Serializable {
     private static final long serialVersionUID = 1L;

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

@@ -0,0 +1,257 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 营销活动-临时促销实体
+ * 表名 mk_activities_promotion
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:25
+ */
+public class MkActivitiesPromotionEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long mapId;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 活动价格
+     */
+    private BigDecimal activityPrice;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 商品编码
+     */
+    private String goodsSn;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 商品品牌
+     */
+    private String productBrand;
+    /**
+     * 商品系列
+     */
+    private String productSeries;
+    /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 截止日期
+     */
+    private String deadline;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMapId(Long mapId) {
+        this.mapId = mapId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMapId() {
+        return mapId;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取：产品中文名
+     */
+    public String getProductName() {
+        return productName;
+    }
+    /**
+     * 设置：活动价格
+     */
+    public void setActivityPrice(BigDecimal activityPrice) {
+        this.activityPrice = activityPrice;
+    }
+
+    /**
+     * 获取：活动价格
+     */
+    public BigDecimal getActivityPrice() {
+        return activityPrice;
+    }
+    /**
+     * 设置：门店编号
+     */
+    public void setShopSn(String shopSn) {
+        this.shopSn = shopSn;
+    }
+
+    /**
+     * 获取：门店编号
+     */
+    public String getShopSn() {
+        return shopSn;
+    }
+    /**
+     * 设置：商品编码
+     */
+    public void setGoodsSn(String goodsSn) {
+        this.goodsSn = goodsSn;
+    }
+
+    /**
+     * 获取：商品编码
+     */
+    public String getGoodsSn() {
+        return goodsSn;
+    }
+    /**
+     * 设置：条形码
+     */
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    /**
+     * 获取：条形码
+     */
+    public String getBarcode() {
+        return barcode;
+    }
+    /**
+     * 设置：商品品牌
+     */
+    public void setProductBrand(String productBrand) {
+        this.productBrand = productBrand;
+    }
+
+    /**
+     * 获取：商品品牌
+     */
+    public String getProductBrand() {
+        return productBrand;
+    }
+    /**
+     * 设置：商品系列
+     */
+    public void setProductSeries(String productSeries) {
+        this.productSeries = productSeries;
+    }
+
+    /**
+     * 获取：商品系列
+     */
+    public String getProductSeries() {
+        return productSeries;
+    }
+    /**
+     * 设置：营销活动编号
+     */
+    public void setMkaId(Long mkaId) {
+        this.mkaId = mkaId;
+    }
+
+    /**
+     * 获取：营销活动编号
+     */
+    public Long getMkaId() {
+        return mkaId;
+    }
+    /**
+     * 设置：截止日期
+     */
+    public void setDeadline(String deadline) {
+        this.deadline = deadline;
+    }
+
+    /**
+     * 获取：截止日期
+     */
+    public String getDeadline() {
+        return deadline;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：创建人编号
+     */
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    /**
+     * 获取：创建人编号
+     */
+    public String getCreaterSn() {
+        return createrSn;
+    }
+    /**
+     * 设置：修改人编号
+     */
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    /**
+     * 获取：修改人编号
+     */
+    public String getModerSn() {
+        return moderSn;
+    }
+    /**
+     * 设置：修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+}

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

@@ -0,0 +1,257 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 营销活动-日常活动实体
+ * 表名 mk_daily_activities
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+public class MkDailyActivitiesEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long mdaId;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 日常价
+     */
+    private BigDecimal dailyPrice;
+    /**
+     * 活动价格
+     */
+    private BigDecimal activityPrice;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 商品编码
+     */
+    private String goodsSn;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 商品品牌
+     */
+    private String productBrand;
+    /**
+     * 商品系列
+     */
+    private String productSeries;
+    /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMdaId(Long mdaId) {
+        this.mdaId = mdaId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMdaId() {
+        return mdaId;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取：产品中文名
+     */
+    public String getProductName() {
+        return productName;
+    }
+    /**
+     * 设置：日常价
+     */
+    public void setDailyPrice(BigDecimal dailyPrice) {
+        this.dailyPrice = dailyPrice;
+    }
+
+    /**
+     * 获取：日常价
+     */
+    public BigDecimal getDailyPrice() {
+        return dailyPrice;
+    }
+    /**
+     * 设置：活动价格
+     */
+    public void setActivityPrice(BigDecimal activityPrice) {
+        this.activityPrice = activityPrice;
+    }
+
+    /**
+     * 获取：活动价格
+     */
+    public BigDecimal getActivityPrice() {
+        return activityPrice;
+    }
+    /**
+     * 设置：门店编号
+     */
+    public void setShopSn(String shopSn) {
+        this.shopSn = shopSn;
+    }
+
+    /**
+     * 获取：门店编号
+     */
+    public String getShopSn() {
+        return shopSn;
+    }
+    /**
+     * 设置：商品编码
+     */
+    public void setGoodsSn(String goodsSn) {
+        this.goodsSn = goodsSn;
+    }
+
+    /**
+     * 获取：商品编码
+     */
+    public String getGoodsSn() {
+        return goodsSn;
+    }
+    /**
+     * 设置：条形码
+     */
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    /**
+     * 获取：条形码
+     */
+    public String getBarcode() {
+        return barcode;
+    }
+    /**
+     * 设置：商品品牌
+     */
+    public void setProductBrand(String productBrand) {
+        this.productBrand = productBrand;
+    }
+
+    /**
+     * 获取：商品品牌
+     */
+    public String getProductBrand() {
+        return productBrand;
+    }
+    /**
+     * 设置：商品系列
+     */
+    public void setProductSeries(String productSeries) {
+        this.productSeries = productSeries;
+    }
+
+    /**
+     * 获取：商品系列
+     */
+    public String getProductSeries() {
+        return productSeries;
+    }
+    /**
+     * 设置：营销活动编号
+     */
+    public void setMkaId(Long mkaId) {
+        this.mkaId = mkaId;
+    }
+
+    /**
+     * 获取：营销活动编号
+     */
+    public Long getMkaId() {
+        return mkaId;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：创建人编号
+     */
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    /**
+     * 获取：创建人编号
+     */
+    public String getCreaterSn() {
+        return createrSn;
+    }
+    /**
+     * 设置：修改人编号
+     */
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    /**
+     * 获取：修改人编号
+     */
+    public String getModerSn() {
+        return moderSn;
+    }
+    /**
+     * 设置：修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesCombinationPriceService.java

@@ -10,14 +10,14 @@ import java.util.Map;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesCombinationPriceService {
 
     /**
      * 根据主键查询实体
      *
-     * @param macpId 主键
+     * @param id 主键
      * @return 实体
      */
     MkActivitiesCombinationPriceEntity queryObject(Long macpId);

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesCouponService.java

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 营销活动-优惠券Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+public interface MkActivitiesCouponService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    MkActivitiesCouponEntity queryObject(Long macId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkActivitiesCouponEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkActivitiesCoupon 实体
+     * @return 保存条数
+     */
+    int save(MkActivitiesCouponEntity mkActivitiesCoupon);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkActivitiesCoupon 实体
+     * @return 更新条数
+     */
+    int update(MkActivitiesCouponEntity mkActivitiesCoupon);
+
+    /**
+     * 根据主键删除
+     *
+     * @param macId
+     * @return 删除条数
+     */
+    int delete(Long macId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param macIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]macIds);
+}

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesDiscountService.java

@@ -10,7 +10,7 @@ import java.util.Map;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesDiscountService {
 

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesFullGiftService.java

@@ -10,7 +10,7 @@ import java.util.Map;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesFullGiftService {
 

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesFullReductionService.java

@@ -6,13 +6,11 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
-活动方式
-满减，满xxx元立减xx元（xService接口
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已活动方式满减，满xxx元立减xx元（xService接口
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesFullReductionService {
 

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesGetOneFreeGoodsService.java

@@ -6,14 +6,12 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 买一送一商品配置表
-
-说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
-                                                     -&#Service接口
+ * 营销活动--买一送
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空Service接口
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 public interface MkActivitiesGetOneFreeGoodsService {
 

kmall-admin/src/main/java/com/kmall/admin/service/MkActivitiesPromotionService.java

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.MkActivitiesPromotionEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 营销活动-临时促销Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:25
+ */
+public interface MkActivitiesPromotionService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    MkActivitiesPromotionEntity queryObject(Long mapId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkActivitiesPromotionEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkActivitiesPromotion 实体
+     * @return 保存条数
+     */
+    int save(MkActivitiesPromotionEntity mkActivitiesPromotion);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkActivitiesPromotion 实体
+     * @return 更新条数
+     */
+    int update(MkActivitiesPromotionEntity mkActivitiesPromotion);
+
+    /**
+     * 根据主键删除
+     *
+     * @param mapId
+     * @return 删除条数
+     */
+    int delete(Long mapId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param mapIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]mapIds);
+}

kmall-admin/src/main/java/com/kmall/admin/service/MkDailyActivitiesService.java

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.MkDailyActivitiesEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 营销活动-日常活动Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+public interface MkDailyActivitiesService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    MkDailyActivitiesEntity queryObject(Long mdaId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkDailyActivitiesEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkDailyActivities 实体
+     * @return 保存条数
+     */
+    int save(MkDailyActivitiesEntity mkDailyActivities);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkDailyActivities 实体
+     * @return 更新条数
+     */
+    int update(MkDailyActivitiesEntity mkDailyActivities);
+
+    /**
+     * 根据主键删除
+     *
+     * @param mdaId
+     * @return 删除条数
+     */
+    int delete(Long mdaId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param mdaIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]mdaIds);
+}

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

@@ -15,7 +15,7 @@ import com.kmall.admin.service.MkActivitiesCombinationPriceService;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Service("mkActivitiesCombinationPriceService")
 public class MkActivitiesCombinationPriceServiceImpl implements MkActivitiesCombinationPriceService {

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

@@ -0,0 +1,59 @@
+package com.kmall.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.dao.MkActivitiesCouponDao;
+import com.kmall.admin.entity.MkActivitiesCouponEntity;
+import com.kmall.admin.service.MkActivitiesCouponService;
+
+/**
+ * 营销活动-优惠券Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+@Service("mkActivitiesCouponService")
+public class MkActivitiesCouponServiceImpl implements MkActivitiesCouponService {
+    @Autowired
+    private MkActivitiesCouponDao mkActivitiesCouponDao;
+
+    @Override
+    public MkActivitiesCouponEntity queryObject(Long macId) {
+        return mkActivitiesCouponDao.queryObject(macId);
+    }
+
+    @Override
+    public List<MkActivitiesCouponEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesCouponDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesCouponDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesCouponEntity mkActivitiesCoupon) {
+        return mkActivitiesCouponDao.save(mkActivitiesCoupon);
+    }
+
+    @Override
+    public int update(MkActivitiesCouponEntity mkActivitiesCoupon) {
+        return mkActivitiesCouponDao.update(mkActivitiesCoupon);
+    }
+
+    @Override
+    public int delete(Long macId) {
+        return mkActivitiesCouponDao.delete(macId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]macIds) {
+        return mkActivitiesCouponDao.deleteBatch(macIds);
+    }
+}

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

@@ -15,7 +15,7 @@ import com.kmall.admin.service.MkActivitiesDiscountService;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Service("mkActivitiesDiscountService")
 public class MkActivitiesDiscountServiceImpl implements MkActivitiesDiscountService {

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

@@ -15,7 +15,7 @@ import com.kmall.admin.service.MkActivitiesFullGiftService;
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Service("mkActivitiesFullGiftService")
 public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftService {

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

@@ -11,13 +11,11 @@ import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
 import com.kmall.admin.service.MkActivitiesFullReductionService;
 
 /**
- * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
-活动方式
-满减，满xxx元立减xx元（xService实现类
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已活动方式满减，满xxx元立减xx元（xService实现类
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Service("mkActivitiesFullReductionService")
 public class MkActivitiesFullReductionServiceImpl implements MkActivitiesFullReductionService {

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

@@ -11,14 +11,12 @@ import com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity;
 import com.kmall.admin.service.MkActivitiesGetOneFreeGoodsService;
 
 /**
- * 买一送一商品配置表
-
-说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
-                                                     -&#Service实现类
+ * 营销活动--买一送
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空Service实现类
  *
  * @author emato
  * @email admin@qhdswl.com
- * @date 2020-09-22 09:44:34
+ * @date 2020-09-23 10:43:25
  */
 @Service("mkActivitiesGetOneFreeGoodsService")
 public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOneFreeGoodsService {

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

@@ -0,0 +1,59 @@
+package com.kmall.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.dao.MkActivitiesPromotionDao;
+import com.kmall.admin.entity.MkActivitiesPromotionEntity;
+import com.kmall.admin.service.MkActivitiesPromotionService;
+
+/**
+ * 营销活动-临时促销Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:25
+ */
+@Service("mkActivitiesPromotionService")
+public class MkActivitiesPromotionServiceImpl implements MkActivitiesPromotionService {
+    @Autowired
+    private MkActivitiesPromotionDao mkActivitiesPromotionDao;
+
+    @Override
+    public MkActivitiesPromotionEntity queryObject(Long mapId) {
+        return mkActivitiesPromotionDao.queryObject(mapId);
+    }
+
+    @Override
+    public List<MkActivitiesPromotionEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesPromotionDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesPromotionDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesPromotionEntity mkActivitiesPromotion) {
+        return mkActivitiesPromotionDao.save(mkActivitiesPromotion);
+    }
+
+    @Override
+    public int update(MkActivitiesPromotionEntity mkActivitiesPromotion) {
+        return mkActivitiesPromotionDao.update(mkActivitiesPromotion);
+    }
+
+    @Override
+    public int delete(Long mapId) {
+        return mkActivitiesPromotionDao.delete(mapId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]mapIds) {
+        return mkActivitiesPromotionDao.deleteBatch(mapIds);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.kmall.admin.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.dao.MkDailyActivitiesDao;
+import com.kmall.admin.entity.MkDailyActivitiesEntity;
+import com.kmall.admin.service.MkDailyActivitiesService;
+
+/**
+ * 营销活动-日常活动Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-23 10:43:26
+ */
+@Service("mkDailyActivitiesService")
+public class MkDailyActivitiesServiceImpl implements MkDailyActivitiesService {
+    @Autowired
+    private MkDailyActivitiesDao mkDailyActivitiesDao;
+
+    @Override
+    public MkDailyActivitiesEntity queryObject(Long mdaId) {
+        return mkDailyActivitiesDao.queryObject(mdaId);
+    }
+
+    @Override
+    public List<MkDailyActivitiesEntity> queryList(Map<String, Object> map) {
+        return mkDailyActivitiesDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkDailyActivitiesDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkDailyActivitiesEntity mkDailyActivities) {
+        return mkDailyActivitiesDao.save(mkDailyActivities);
+    }
+
+    @Override
+    public int update(MkDailyActivitiesEntity mkDailyActivities) {
+        return mkDailyActivitiesDao.update(mkDailyActivities);
+    }
+
+    @Override
+    public int delete(Long mdaId) {
+        return mkDailyActivitiesDao.delete(mdaId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]mdaIds) {
+        return mkDailyActivitiesDao.deleteBatch(mdaIds);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivitiesServiceImpl.java

@@ -50,6 +50,10 @@ public class MkActivitiesServiceImpl implements MkActivitiesService {
     @Override
     @Transactional
     public int save(MkActivitiesEntity mkActivities) {
+
+        // 先根据营销方式跟mkCode查询是否有
+
+
         SysUserEntity user = ShiroUtils.getUserEntity();
 
         mkActivities.setCreaterSn(user.getUserId().toString());

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

@@ -34,18 +34,20 @@ public class PDFWrite_nohead_36 {
 
         writer.setPdfVersion(PdfWriter.PDF_VERSION_1_2);//版本(默认1.4)
         doc.open();// 打开文档
-        doc.setMargins(0,0,0,0);
-
+        doc.setMargins(0,0,-20,0);
+        String dtoBarCode = pdfGoodsDto.getBarCode();
+        byte[] bytes = BarcodeUtil.generateBarCode128(dtoBarCode, 9.0d, 1.28d, false, true);
+        String uploadUrl = FileManager.upload(dtoBarCode + UUID.randomUUID().toString(), bytes, String.valueOf(bytes.length));
         // -----------------------标签头----------------------
         for (int i = 0; i < 9; i++) {
-            getPdfPTable(FontChinese11, bfHei, doc,pdfGoodsDto);
+            getPdfPTable(FontChinese11, bfHei, doc,pdfGoodsDto,uploadUrl);
         }
 
         doc.close();  //记得关闭document
 
     }
 
-    private static void getPdfPTable(Font fontChinese11, BaseFont bfHei, Document doc, PDFGoodsDto pdfGoodsDto) throws IOException, DocumentException {
+    private static void getPdfPTable(Font fontChinese11, BaseFont bfHei, Document doc, PDFGoodsDto pdfGoodsDto,String uploadUrl) throws IOException, DocumentException {
         PdfPTable table = new PdfPTable(4);
 
         // --------------产品名称-------------------------------
@@ -72,12 +74,12 @@ public class PDFWrite_nohead_36 {
         table = new PdfPTable(4);
 
         for (int i = 0; i < 4; i++) {
-           PdfPTable pdfPTable4 = new PdfPTable(1);
-            Font font = new Font(bfHei, 20);
+//           PdfPTable pdfPTable4 = new PdfPTable(1);
+            Font font = new Font(bfHei, 18);
             Paragraph bigPrice = new Paragraph("￥"+pdfGoodsDto.getPrice().substring(0,pdfGoodsDto.getPrice().indexOf(".")), font);
             bigPrice.setAlignment(Element.ALIGN_BOTTOM);
             // --------------小价格-------------------------------
-            font = new Font(bfHei, 10);
+            font = new Font(bfHei, 9);
             Paragraph smallPrice = new Paragraph(pdfGoodsDto.getPrice().substring(pdfGoodsDto.getPrice().indexOf(".")), font);
             smallPrice.setAlignment(Element.ALIGN_BOTTOM);
             smallPrice.setIndentationLeft(50);
@@ -87,14 +89,15 @@ public class PDFWrite_nohead_36 {
 
             PdfPCell priceCell = new PdfPCell(bigPrice);
             priceCell.setBorder(0);
-            priceCell.setHorizontalAlignment(Element.ALIGN_LEFT); // 水平居中
-            priceCell.setVerticalAlignment(Element.ALIGN_BOTTOM); // 垂直居中
-            pdfPTable4.addCell(priceCell);
+            priceCell.setHorizontalAlignment(Element.ALIGN_RIGHT); // 右边
+            priceCell.setVerticalAlignment(Element.ALIGN_BOTTOM); // 下面
+            priceCell.setPaddingRight(15f);
+//            pdfPTable4.addCell(priceCell);
 
 
             // ----------------test-----------------------
             PdfPTable pdfPTable8 = new PdfPTable(2);
-            pdfPTable8.setWidths(new int[]{10,8});
+            pdfPTable8.setWidths(new int[]{10,11});
             font = new Font(bfHei, 6);
             // --------------左上的字-------------------------------
             Paragraph leftParagraph1 = new Paragraph("\n建议零售价省￥"+pdfGoodsDto.getSavings()+"\n\n", font);
@@ -110,7 +113,7 @@ public class PDFWrite_nohead_36 {
 
             PdfPCell p = new PdfPCell(pdfPTable8);
             p.setBorder(0);
-            table.setWidthPercentage(110f);
+            table.setWidthPercentage(112f);
             table.addCell(p);
         }
 
@@ -118,15 +121,15 @@ public class PDFWrite_nohead_36 {
         doc.add(table);
         String dtoBarCode = pdfGoodsDto.getBarCode();
         table = new PdfPTable(4);
-        byte[] bytes = BarcodeUtil.generateBarCode128(dtoBarCode, 9.0d, 1.28d, false, true);
-        String uploadUrl = FileManager.upload(dtoBarCode + UUID.randomUUID().toString(), bytes, String.valueOf(bytes.length));
+
         for (int i = 0; i < 4; i++) {
             // --------------底部黑色和条形码区域-------------------------------
             PdfPTable pdfPTable7 = new PdfPTable(2);
+            pdfPTable7.setWidths(new int[]{8,10});
             Font font = new Font(bfHei, 5.5f);
             font.setColor(Color.WHITE);
             Paragraph PLU = new Paragraph(pdfGoodsDto.getPlu(), font);
-            Paragraph blankParagraph = new Paragraph("                        ", font);
+            Paragraph blankParagraph = new Paragraph("                   ", font);
             Paragraph barCode = new Paragraph(dtoBarCode.substring(dtoBarCode.length()-4), font);
             blankParagraph.add(barCode);
             PLU.add(blankParagraph);
@@ -144,14 +147,15 @@ public class PDFWrite_nohead_36 {
             img.setAlignment(Image.ALIGN_CENTER);  //设置图片居中
             img.setBorder(Image.NO_BORDER);
             img.setBorderColor(Color.WHITE);
-            img.scaleAbsolute(72,10.5f);
+            img.scaleAbsolute(63,10.5f);
             PdfPCell imgCell = new PdfPCell(img,false);
             imgCell.setBorder(0);
+            imgCell.setPaddingLeft(3f);
             pdfPTable7.addCell(pluCell);
             pdfPTable7.addCell(imgCell);
             PdfPCell p = new PdfPCell(pdfPTable7);
             p.setBorder(0);
-            table.setWidthPercentage(110f);
+            table.setWidthPercentage(112f);
             table.addCell(p);
         }
         doc.add(table);
@@ -179,8 +183,9 @@ public class PDFWrite_nohead_36 {
         Font font = new Font(bfHei, i2); // 设置字体
         Paragraph paragraph = new Paragraph(s, font); // 段落
         PdfPCell nameCell = new PdfPCell(paragraph); // 单元Cell
+        nameCell.setPaddingRight(10f);
         setBasisStyle(nameCell, Element.ALIGN_CENTER, Element.ALIGN_MIDDLE);
-        table.setWidthPercentage(110f);
+        table.setWidthPercentage(112f);
         table.addCell(nameCell);
     }
 

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

@@ -692,7 +692,7 @@
             g.name as productName,
             g.english_name as englishName,
             rela.retail_price as price,
-            (rela.market_price - rela.retail_price ) as savings,
+            IFNULL((rela.market_price - rela.retail_price ),0) as savings,
             g.goods_rate as startFax,
             g.goods_rate as endFax,
             g.plu as plu,
@@ -701,7 +701,7 @@
             mall_goods g
         left join mall_product_store_rela rela on g.id = rela.goods_id
         <where>
-            <if test="sku != null and storeId != ''">
+            <if test="sku != null and sku != ''">
                and g.sku = #{sku}
             </if>
             <if test="prodBarcode != null and prodBarcode != ''">

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

@@ -5,13 +5,12 @@
 
     <resultMap type="com.kmall.admin.entity.MkActivitiesCombinationPriceEntity" id="mkActivitiesCombinationPriceMap">
         <result property="macpId" column="macp_id"/>
-        <result property="combinationBarcode" column="combination_barcode"/>
         <result property="goodsSn" column="goods_sn"/>
         <result property="barcode" column="barcode"/>
         <result property="combinationNum" column="combination_num"/>
-        <result property="productName" column="product_name"/>
         <result property="combinedPrice" column="combined_price"/>
         <result property="mkaId" column="mka_id"/>
+        <result property="deadline" column="deadline"/>
         <result property="createTime" column="create_time"/>
         <result property="createrSn" column="creater_sn"/>
         <result property="moderSn" column="moder_sn"/>
@@ -21,13 +20,12 @@
 	<select id="queryObject" resultType="com.kmall.admin.entity.MkActivitiesCombinationPriceEntity">
 		select
 			`macp_id`,
-			`combination_barcode`,
 			`goods_sn`,
 			`barcode`,
 			`combination_num`,
-			`product_name`,
 			`combined_price`,
 			`mka_id`,
+			`deadline`,
 			`create_time`,
 			`creater_sn`,
 			`moder_sn`,
@@ -39,13 +37,12 @@
 	<select id="queryList" resultType="com.kmall.admin.entity.MkActivitiesCombinationPriceEntity">
 		select
     		`macp_id`,
-    		`combination_barcode`,
     		`goods_sn`,
     		`barcode`,
     		`combination_num`,
-    		`product_name`,
     		`combined_price`,
     		`mka_id`,
+    		`deadline`,
     		`create_time`,
     		`creater_sn`,
     		`moder_sn`,
@@ -78,25 +75,23 @@
 
 	<insert id="save" parameterType="com.kmall.admin.entity.MkActivitiesCombinationPriceEntity" useGeneratedKeys="true" keyProperty="macpId">
 		insert into mk_activities_combination_price(
-			`combination_barcode`,
 			`goods_sn`,
 			`barcode`,
 			`combination_num`,
-			`product_name`,
 			`combined_price`,
 			`mka_id`,
+			`deadline`,
 			`create_time`,
 			`creater_sn`,
 			`moder_sn`,
 			`update_time`)
 		values(
-			#{combinationBarcode},
 			#{goodsSn},
 			#{barcode},
 			#{combinationNum},
-			#{productName},
 			#{combinedPrice},
 			#{mkaId},
+			#{deadline},
 			#{createTime},
 			#{createrSn},
 			#{moderSn},
@@ -106,13 +101,12 @@
 	<update id="update" parameterType="com.kmall.admin.entity.MkActivitiesCombinationPriceEntity">
 		update mk_activities_combination_price
 		<set>
-			<if test="combinationBarcode != null">`combination_barcode` = #{combinationBarcode}, </if>
 			<if test="goodsSn != null">`goods_sn` = #{goodsSn}, </if>
 			<if test="barcode != null">`barcode` = #{barcode}, </if>
 			<if test="combinationNum != null">`combination_num` = #{combinationNum}, </if>
-			<if test="productName != null">`product_name` = #{productName}, </if>
 			<if test="combinedPrice != null">`combined_price` = #{combinedPrice}, </if>
 			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="deadline != null">`deadline` = #{deadline}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>

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

@@ -0,0 +1,135 @@
+<?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.MkActivitiesCouponDao">
+
+    <resultMap type="com.kmall.admin.entity.MkActivitiesCouponEntity" id="mkActivitiesCouponMap">
+        <result property="macId" column="mac_id"/>
+        <result property="goodsSn" column="goods_sn"/>
+        <result property="barcode" column="barcode"/>
+        <result property="shopSn" column="shop_sn"/>
+        <result property="couponSn" column="coupon_sn"/>
+        <result property="couponPrice" column="coupon_price"/>
+        <result property="mkaId" column="mka_id"/>
+        <result property="deadline" column="deadline"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createrSn" column="creater_sn"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.MkActivitiesCouponEntity">
+		select
+			`mac_id`,
+			`goods_sn`,
+			`barcode`,
+			`shop_sn`,
+			`coupon_sn`,
+			`coupon_price`,
+			`mka_id`,
+			`deadline`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_coupon
+		where mac_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MkActivitiesCouponEntity">
+		select
+    		`mac_id`,
+    		`goods_sn`,
+    		`barcode`,
+    		`shop_sn`,
+    		`coupon_sn`,
+    		`coupon_price`,
+    		`mka_id`,
+    		`deadline`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_coupon
+		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 mac_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mk_activities_coupon
+		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.MkActivitiesCouponEntity" useGeneratedKeys="true" keyProperty="macId">
+		insert into mk_activities_coupon(
+			`goods_sn`,
+			`barcode`,
+			`shop_sn`,
+			`coupon_sn`,
+			`coupon_price`,
+			`mka_id`,
+			`deadline`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{goodsSn},
+			#{barcode},
+			#{shopSn},
+			#{couponSn},
+			#{couponPrice},
+			#{mkaId},
+			#{deadline},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.MkActivitiesCouponEntity">
+		update mk_activities_coupon
+		<set>
+			<if test="goodsSn != null">`goods_sn` = #{goodsSn}, </if>
+			<if test="barcode != null">`barcode` = #{barcode}, </if>
+			<if test="shopSn != null">`shop_sn` = #{shopSn}, </if>
+			<if test="couponSn != null">`coupon_sn` = #{couponSn}, </if>
+			<if test="couponPrice != null">`coupon_price` = #{couponPrice}, </if>
+			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="deadline != null">`deadline` = #{deadline}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+		</set>
+		where mac_id = #{macId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_activities_coupon where mac_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_activities_coupon where mac_id in
+		<foreach item="macId" collection="array" open="(" separator="," close=")">
+			#{macId}
+		</foreach>
+	</delete>
+
+</mapper>

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

@@ -13,6 +13,8 @@
         <result property="productSeries" column="product_series"/>
         <result property="qualifiedAmount" column="qualified_amount"/>
         <result property="giftBarcode" column="gift_barcode"/>
+        <result property="mkaId" column="mka_id"/>
+        <result property="deadline" column="deadline"/>
         <result property="createTime" column="create_time"/>
         <result property="createrSn" column="creater_sn"/>
         <result property="moderSn" column="moder_sn"/>
@@ -30,6 +32,8 @@
 			`product_series`,
 			`qualified_amount`,
 			`gift_barcode`,
+			`mka_id`,
+			`deadline`,
 			`create_time`,
 			`creater_sn`,
 			`moder_sn`,
@@ -49,6 +53,8 @@
     		`product_series`,
     		`qualified_amount`,
     		`gift_barcode`,
+    		`mka_id`,
+    		`deadline`,
     		`create_time`,
     		`creater_sn`,
     		`moder_sn`,
@@ -89,6 +95,8 @@
 			`product_series`,
 			`qualified_amount`,
 			`gift_barcode`,
+			`mka_id`,
+			`deadline`,
 			`create_time`,
 			`creater_sn`,
 			`moder_sn`,
@@ -102,6 +110,8 @@
 			#{productSeries},
 			#{qualifiedAmount},
 			#{giftBarcode},
+			#{mkaId},
+			#{deadline},
 			#{createTime},
 			#{createrSn},
 			#{moderSn},
@@ -119,6 +129,8 @@
 			<if test="productSeries != null">`product_series` = #{productSeries}, </if>
 			<if test="qualifiedAmount != null">`qualified_amount` = #{qualifiedAmount}, </if>
 			<if test="giftBarcode != null">`gift_barcode` = #{giftBarcode}, </if>
+			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="deadline != null">`deadline` = #{deadline}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>

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

@@ -13,6 +13,8 @@
         <result property="productSeries" column="product_series"/>
         <result property="qualifiedAmount" column="qualified_amount"/>
         <result property="deductionAmount" column="deduction_amount"/>
+        <result property="mkaId" column="mka_id"/>
+        <result property="deadline" column="deadline"/>
         <result property="createTime" column="create_time"/>
         <result property="createrSn" column="creater_sn"/>
         <result property="moderSn" column="moder_sn"/>
@@ -30,6 +32,8 @@
 			`product_series`,
 			`qualified_amount`,
 			`deduction_amount`,
+			`mka_id`,
+			`deadline`,
 			`create_time`,
 			`creater_sn`,
 			`moder_sn`,
@@ -49,6 +53,8 @@
     		`product_series`,
     		`qualified_amount`,
     		`deduction_amount`,
+    		`mka_id`,
+    		`deadline`,
     		`create_time`,
     		`creater_sn`,
     		`moder_sn`,
@@ -89,6 +95,8 @@
 			`product_series`,
 			`qualified_amount`,
 			`deduction_amount`,
+			`mka_id`,
+			`deadline`,
 			`create_time`,
 			`creater_sn`,
 			`moder_sn`,
@@ -102,6 +110,8 @@
 			#{productSeries},
 			#{qualifiedAmount},
 			#{deductionAmount},
+			#{mkaId},
+			#{deadline},
 			#{createTime},
 			#{createrSn},
 			#{moderSn},
@@ -119,6 +129,8 @@
 			<if test="productSeries != null">`product_series` = #{productSeries}, </if>
 			<if test="qualifiedAmount != null">`qualified_amount` = #{qualifiedAmount}, </if>
 			<if test="deductionAmount != null">`deduction_amount` = #{deductionAmount}, </if>
+			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="deadline != null">`deadline` = #{deadline}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>

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

@@ -0,0 +1,147 @@
+<?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.MkActivitiesPromotionDao">
+
+    <resultMap type="com.kmall.admin.entity.MkActivitiesPromotionEntity" id="mkActivitiesPromotionMap">
+        <result property="mapId" column="map_id"/>
+        <result property="productName" column="product_name"/>
+        <result property="activityPrice" column="activity_price"/>
+        <result property="shopSn" column="shop_sn"/>
+        <result property="goodsSn" column="goods_sn"/>
+        <result property="barcode" column="barcode"/>
+        <result property="productBrand" column="product_brand"/>
+        <result property="productSeries" column="product_series"/>
+        <result property="mkaId" column="mka_id"/>
+        <result property="deadline" column="deadline"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createrSn" column="creater_sn"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.MkActivitiesPromotionEntity">
+		select
+			`map_id`,
+			`product_name`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`mka_id`,
+			`deadline`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_promotion
+		where map_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MkActivitiesPromotionEntity">
+		select
+    		`map_id`,
+    		`product_name`,
+    		`activity_price`,
+    		`shop_sn`,
+    		`goods_sn`,
+    		`barcode`,
+    		`product_brand`,
+    		`product_series`,
+    		`mka_id`,
+    		`deadline`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_promotion
+		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 map_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mk_activities_promotion
+		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.MkActivitiesPromotionEntity" useGeneratedKeys="true" keyProperty="mapId">
+		insert into mk_activities_promotion(
+			`product_name`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`mka_id`,
+			`deadline`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{productName},
+			#{activityPrice},
+			#{shopSn},
+			#{goodsSn},
+			#{barcode},
+			#{productBrand},
+			#{productSeries},
+			#{mkaId},
+			#{deadline},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.MkActivitiesPromotionEntity">
+		update mk_activities_promotion
+		<set>
+			<if test="productName != null">`product_name` = #{productName}, </if>
+			<if test="activityPrice != null">`activity_price` = #{activityPrice}, </if>
+			<if test="shopSn != null">`shop_sn` = #{shopSn}, </if>
+			<if test="goodsSn != null">`goods_sn` = #{goodsSn}, </if>
+			<if test="barcode != null">`barcode` = #{barcode}, </if>
+			<if test="productBrand != null">`product_brand` = #{productBrand}, </if>
+			<if test="productSeries != null">`product_series` = #{productSeries}, </if>
+			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="deadline != null">`deadline` = #{deadline}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+		</set>
+		where map_id = #{mapId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_activities_promotion where map_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_activities_promotion where map_id in
+		<foreach item="mapId" collection="array" open="(" separator="," close=")">
+			#{mapId}
+		</foreach>
+	</delete>
+
+</mapper>

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

@@ -0,0 +1,147 @@
+<?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.MkDailyActivitiesDao">
+
+    <resultMap type="com.kmall.admin.entity.MkDailyActivitiesEntity" id="mkDailyActivitiesMap">
+        <result property="mdaId" column="mda_id"/>
+        <result property="productName" column="product_name"/>
+        <result property="dailyPrice" column="daily_price"/>
+        <result property="activityPrice" column="activity_price"/>
+        <result property="shopSn" column="shop_sn"/>
+        <result property="goodsSn" column="goods_sn"/>
+        <result property="barcode" column="barcode"/>
+        <result property="productBrand" column="product_brand"/>
+        <result property="productSeries" column="product_series"/>
+        <result property="mkaId" column="mka_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createrSn" column="creater_sn"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.MkDailyActivitiesEntity">
+		select
+			`mda_id`,
+			`product_name`,
+			`daily_price`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_daily_activities
+		where mda_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MkDailyActivitiesEntity">
+		select
+    		`mda_id`,
+    		`product_name`,
+    		`daily_price`,
+    		`activity_price`,
+    		`shop_sn`,
+    		`goods_sn`,
+    		`barcode`,
+    		`product_brand`,
+    		`product_series`,
+    		`mka_id`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_daily_activities
+		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 mda_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mk_daily_activities
+		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.MkDailyActivitiesEntity" useGeneratedKeys="true" keyProperty="mdaId">
+		insert into mk_daily_activities(
+			`product_name`,
+			`daily_price`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{productName},
+			#{dailyPrice},
+			#{activityPrice},
+			#{shopSn},
+			#{goodsSn},
+			#{barcode},
+			#{productBrand},
+			#{productSeries},
+			#{mkaId},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.MkDailyActivitiesEntity">
+		update mk_daily_activities
+		<set>
+			<if test="productName != null">`product_name` = #{productName}, </if>
+			<if test="dailyPrice != null">`daily_price` = #{dailyPrice}, </if>
+			<if test="activityPrice != null">`activity_price` = #{activityPrice}, </if>
+			<if test="shopSn != null">`shop_sn` = #{shopSn}, </if>
+			<if test="goodsSn != null">`goods_sn` = #{goodsSn}, </if>
+			<if test="barcode != null">`barcode` = #{barcode}, </if>
+			<if test="productBrand != null">`product_brand` = #{productBrand}, </if>
+			<if test="productSeries != null">`product_series` = #{productSeries}, </if>
+			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+		</set>
+		where mda_id = #{mdaId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_daily_activities where mda_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_daily_activities where mda_id in
+		<foreach item="mdaId" collection="array" open="(" separator="," close=")">
+			#{mdaId}
+		</foreach>
+	</delete>
+
+</mapper>

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

@@ -34,9 +34,6 @@
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="mkActivitiesCombinationPrice" :rules="ruleValidate" :label-width="80">
-            <Form-item label="组合条码" prop="combinationBarcode">
-                <i-input v-model="mkActivitiesCombinationPrice.combinationBarcode" placeholder="组合条码"/>
-            </Form-item>
             <Form-item label="商品编码" prop="goodsSn">
                 <i-input v-model="mkActivitiesCombinationPrice.goodsSn" placeholder="商品编码"/>
             </Form-item>
@@ -46,15 +43,15 @@
             <Form-item label="组合的产品数量" prop="combinationNum">
                 <i-input v-model="mkActivitiesCombinationPrice.combinationNum" placeholder="组合的产品数量"/>
             </Form-item>
-            <Form-item label="产品中文名" prop="productName">
-                <i-input v-model="mkActivitiesCombinationPrice.productName" placeholder="产品中文名"/>
-            </Form-item>
             <Form-item label="组合价" prop="combinedPrice">
                 <i-input v-model="mkActivitiesCombinationPrice.combinedPrice" placeholder="组合价"/>
             </Form-item>
             <Form-item label="营销活动编号" prop="mkaId">
                 <i-input v-model="mkActivitiesCombinationPrice.mkaId" placeholder="营销活动编号"/>
             </Form-item>
+            <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>
@@ -76,6 +73,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiescombinationprice.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiescombinationprice.js?_${date.systemTime}"></script>
 </body>
 </html>

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

@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>营销活动-优惠券</title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("mkactivitiescoupon:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiescoupon:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiescoupon:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </div>
+        </Row>
+	    <table id="jqGrid"></table>
+	    <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="mkActivitiesCoupon" :rules="ruleValidate" :label-width="80">
+            <Form-item label="适用商品编号" prop="goodsSn">
+                <i-input v-model="mkActivitiesCoupon.goodsSn" placeholder="适用商品编号"/>
+            </Form-item>
+            <Form-item label="适用商品条码" prop="barcode">
+                <i-input v-model="mkActivitiesCoupon.barcode" placeholder="适用商品条码"/>
+            </Form-item>
+            <Form-item label="门店编号" prop="shopSn">
+                <i-input v-model="mkActivitiesCoupon.shopSn" placeholder="门店编号"/>
+            </Form-item>
+            <Form-item label="优惠券码" prop="couponSn">
+                <i-input v-model="mkActivitiesCoupon.couponSn" placeholder="优惠券码"/>
+            </Form-item>
+            <Form-item label="优惠金额" prop="couponPrice">
+                <i-input v-model="mkActivitiesCoupon.couponPrice" placeholder="优惠金额"/>
+            </Form-item>
+            <Form-item label="营销活动编号" prop="mkaId">
+                <i-input v-model="mkActivitiesCoupon.mkaId" placeholder="营销活动编号"/>
+            </Form-item>
+            <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>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/mk/mkactivitiescoupon.js?_${date.systemTime}"></script>
+</body>
+</html>

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

@@ -82,6 +82,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesdiscount.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesdiscount.js?_${date.systemTime}"></script>
 </body>
 </html>

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

@@ -58,6 +58,12 @@
             <Form-item label="赠品条码" prop="giftBarcode">
                 <i-input v-model="mkActivitiesFullGift.giftBarcode" placeholder="赠品条码"/>
             </Form-item>
+            <Form-item label="营销活动编号" prop="mkaId">
+                <i-input v-model="mkActivitiesFullGift.mkaId" placeholder="营销活动编号"/>
+            </Form-item>
+            <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>
@@ -79,6 +85,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesfullgift.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesfullgift.js?_${date.systemTime}"></script>
 </body>
 </html>

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

@@ -1,9 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
-活动方式
-满减，满xxx元立减xx元（x</title>
+    <title>商品编码为主要匹配/上传依据，商品条形码为辅助查看而已活动方式满减，满xxx元立减xx元（x</title>
     #parse("sys/header.html")
 </head>
 <body>
@@ -60,6 +58,12 @@
             <Form-item label="减扣金额" prop="deductionAmount">
                 <i-input v-model="mkActivitiesFullReduction.deductionAmount" placeholder="减扣金额"/>
             </Form-item>
+            <Form-item label="营销活动编号" prop="mkaId">
+                <i-input v-model="mkActivitiesFullReduction.mkaId" placeholder="营销活动编号"/>
+            </Form-item>
+            <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>
@@ -81,6 +85,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesfullreduction.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesfullreduction.js?_${date.systemTime}"></script>
 </body>
 </html>

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiesgetonefreegoods.html → kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivitiesgetonefreegoods.html

@@ -1,10 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>买一送一商品配置表
-
-说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
-                                                     -&#</title>
+    <title>营销活动--买一送
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空</title>
     #parse("sys/header.html")
 </head>
 <body>
@@ -91,6 +89,6 @@
 	</Card>
 </div>
 
-<script src="${rc.contextPath}/js/mk/shop/mkactivitiesgetonefreegoods.js?_${date.systemTime}"></script>
+<script src="${rc.contextPath}/js/mk/mkactivitiesgetonefreegoods.js?_${date.systemTime}"></script>
 </body>
 </html>

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

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>营销活动-临时促销</title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("mkactivitiespromotion:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiespromotion:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiespromotion:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </div>
+        </Row>
+	    <table id="jqGrid"></table>
+	    <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="mkActivitiesPromotion" :rules="ruleValidate" :label-width="80">
+            <Form-item label="产品中文名" prop="productName">
+                <i-input v-model="mkActivitiesPromotion.productName" placeholder="产品中文名"/>
+            </Form-item>
+            <Form-item label="活动价格" prop="activityPrice">
+                <i-input v-model="mkActivitiesPromotion.activityPrice" placeholder="活动价格"/>
+            </Form-item>
+            <Form-item label="门店编号" prop="shopSn">
+                <i-input v-model="mkActivitiesPromotion.shopSn" placeholder="门店编号"/>
+            </Form-item>
+            <Form-item label="商品编码" prop="goodsSn">
+                <i-input v-model="mkActivitiesPromotion.goodsSn" placeholder="商品编码"/>
+            </Form-item>
+            <Form-item label="条形码" prop="barcode">
+                <i-input v-model="mkActivitiesPromotion.barcode" placeholder="条形码"/>
+            </Form-item>
+            <Form-item label="商品品牌" prop="productBrand">
+                <i-input v-model="mkActivitiesPromotion.productBrand" placeholder="商品品牌"/>
+            </Form-item>
+            <Form-item label="商品系列" prop="productSeries">
+                <i-input v-model="mkActivitiesPromotion.productSeries" placeholder="商品系列"/>
+            </Form-item>
+            <Form-item label="营销活动编号" prop="mkaId">
+                <i-input v-model="mkActivitiesPromotion.mkaId" placeholder="营销活动编号"/>
+            </Form-item>
+            <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>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/mk/mkactivitiespromotion.js?_${date.systemTime}"></script>
+</body>
+</html>

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

@@ -60,15 +60,6 @@
                 <i-button @click="reloadMkactivitiesSearch">重置</i-button>
             </div>
             <div class="buttons-group">
-                <!--#if($shiro.hasPermission("mkactivities:save"))
-                <i-button type="info" @click="addMkactivities"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivities:update"))
-                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                #end
-                #if($shiro.hasPermission("mkactivities:delete"))
-                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                #end-->
                 <i-button type="info" @click="addMkactivities"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
                 <i-button type="warning" @click="updateMkactivities"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
                 <i-button type="error" @click="delMkactivities"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
@@ -82,7 +73,12 @@
         <p slot="title">{{title}}</p>
         <i-form ref="formMkactivitiesValidate" :model="mkActivities" :rules="ruleValidate" :label-width="80">
             <Form-item label="活动主题" prop="mkaTopic">
-                <i-input v-model="mkActivities.mkaTopic" placeholder="活动主题"/>
+<!--                <i-input v-model="mkActivities.mkaTopic" placeholder="活动主题"/>-->
+                <i-select v-model="mkActivities.mkaTopic" placeholder="活动主题" filterable label-in-value>
+                    <i-option v-for="marketing in marketings" :value="marketing.id"
+                              :key="marketing.id">{{marketing.name}}
+                    </i-option>
+                </i-select>
             </Form-item>
             <Form-item label="商户" prop="merchSn">
                 <i-select v-model="mkActivities.merchSn" filterable placeholder="商户" @on-change="changeMerch" label-in-value>
@@ -140,4 +136,4 @@
 
 <script src="${rc.contextPath}/js/mk/mkactivityform.js?_${date.systemTime}"></script>
 </body>
-</html>
+</html>

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

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>营销活动-日常活动</title>
+    #parse("sys/header.html")
+</head>
+<body>
+<div id="rrapp" v-cloak>
+	<div v-show="showList">
+        <Row :gutter="16">
+            <div class="search-group">
+                <i-col span="4">
+                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                </i-col>
+                <i-button @click="query">查询</i-button>
+                <i-button @click="reloadSearch">重置</i-button>
+            </div>
+            <div class="buttons-group">
+                #if($shiro.hasPermission("mkdailyactivities:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkdailyactivities:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkdailyactivities:delete"))
+                <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
+                #end
+            </div>
+        </Row>
+	    <table id="jqGrid"></table>
+	    <div id="jqGridPager"></div>
+    </div>
+
+    <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+		<i-form ref="formValidate" :model="mkDailyActivities" :rules="ruleValidate" :label-width="80">
+            <Form-item label="产品中文名" prop="productName">
+                <i-input v-model="mkDailyActivities.productName" placeholder="产品中文名"/>
+            </Form-item>
+            <Form-item label="日常价" prop="dailyPrice">
+                <i-input v-model="mkDailyActivities.dailyPrice" placeholder="日常价"/>
+            </Form-item>
+            <Form-item label="活动价格" prop="activityPrice">
+                <i-input v-model="mkDailyActivities.activityPrice" placeholder="活动价格"/>
+            </Form-item>
+            <Form-item label="门店编号" prop="shopSn">
+                <i-input v-model="mkDailyActivities.shopSn" placeholder="门店编号"/>
+            </Form-item>
+            <Form-item label="商品编码" prop="goodsSn">
+                <i-input v-model="mkDailyActivities.goodsSn" placeholder="商品编码"/>
+            </Form-item>
+            <Form-item label="条形码" prop="barcode">
+                <i-input v-model="mkDailyActivities.barcode" placeholder="条形码"/>
+            </Form-item>
+            <Form-item label="商品品牌" prop="productBrand">
+                <i-input v-model="mkDailyActivities.productBrand" placeholder="商品品牌"/>
+            </Form-item>
+            <Form-item label="商品系列" prop="productSeries">
+                <i-input v-model="mkDailyActivities.productSeries" placeholder="商品系列"/>
+            </Form-item>
+            <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>
+                <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置</i-button>
+            </Form-item>
+        </i-form>
+	</Card>
+</div>
+
+<script src="${rc.contextPath}/js/mk/mkdailyactivities.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/js/mk/shop/mkactivitiescombinationprice.js → kmall-admin/src/main/webapp/js/mk/mkactivitiescombinationprice.js

@@ -4,13 +4,12 @@ $(function () {
         datatype: "json",
         colModel: [
 			{label: 'macpId', name: 'macpId', index: 'macp_id', key: true, hidden: true},
-			{label: '组合条码', name: 'combinationBarcode', index: 'combination_barcode', width: 80},
 			{label: '商品编码', name: 'goodsSn', index: 'goods_sn', width: 80},
 			{label: '条形码', name: 'barcode', index: 'barcode', width: 80},
 			{label: '组合的产品数量', name: 'combinationNum', index: 'combination_num', width: 80},
-			{label: '产品中文名', name: 'productName', index: 'product_name', 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},

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

@@ -0,0 +1,149 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkactivitiescoupon/list',
+        datatype: "json",
+        colModel: [
+			{label: 'macId', name: 'macId', index: 'mac_id', key: true, hidden: true},
+			{label: '适用商品编号', name: 'goodsSn', index: 'goods_sn', width: 80},
+			{label: '适用商品条码', name: 'barcode', index: 'barcode', width: 80},
+			{label: '门店编号', name: 'shopSn', index: 'shop_sn', width: 80},
+			{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}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		mkActivitiesCoupon: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkActivitiesCoupon = {};
+		},
+		update: function (event) {
+            let macId = getSelectedRow();
+			if (macId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(macId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkActivitiesCoupon.macId == null ? "../mkactivitiescoupon/save" : "../mkactivitiescoupon/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkActivitiesCoupon),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let macIds = getSelectedRows();
+			if (macIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkactivitiescoupon/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(macIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(macId){
+			$.get("../mkactivitiescoupon/info/"+macId, function (r) {
+                vm.mkActivitiesCoupon = r.mkActivitiesCoupon;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});

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

@@ -12,6 +12,8 @@ $(function () {
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{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},

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

@@ -12,6 +12,8 @@ $(function () {
 			{label: '商品系列', name: 'productSeries', index: 'product_series', width: 80},
 			{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},

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

@@ -0,0 +1,151 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkactivitiespromotion/list',
+        datatype: "json",
+        colModel: [
+			{label: 'mapId', name: 'mapId', index: 'map_id', key: true, hidden: true},
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
+			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80},
+			{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: '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}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		mkActivitiesPromotion: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkActivitiesPromotion = {};
+		},
+		update: function (event) {
+            let mapId = getSelectedRow();
+			if (mapId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(mapId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkActivitiesPromotion.mapId == null ? "../mkactivitiespromotion/save" : "../mkactivitiespromotion/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkActivitiesPromotion),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let mapIds = getSelectedRows();
+			if (mapIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkactivitiespromotion/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(mapIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(mapId){
+			$.get("../mkactivitiespromotion/info/"+mapId, function (r) {
+                vm.mkActivitiesPromotion = r.mkActivitiesPromotion;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});

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

@@ -22,11 +22,12 @@ $(function () {
         ],
         viewrecords: true,
         height: 550,
+        width:1680,
         rowNum: 10,
         rowList: [10, 30, 50],
         rownumbers: true,
         rownumWidth: 25,
-        autowidth: true,
+        autowidth: false,
         multiselect: true,
         pager: "#jqGridPager",
         jsonReader: {
@@ -45,15 +46,41 @@ $(function () {
         }
     });
 
-    //营销方式
+    var marketing =
+        {'lscx': '临时促销','yhq': '优惠券','rchd': '日常活动','mysy': '买一送一','mj': '满减', 'mz': '满赠','dz': '打折','zhjsp': '组合价商品'};
+
+
+
+
     $("#jqGridOrder").jqGrid({
         url: '../mkactivityform/queryMkactivitiesList',
         datatype: "json",
         colModel: [
             {label: 'mkaId', name: 'mkaId', index: 'mka_id', key: true, hidden: true},
-            {label: '活动主题', name: 'mkaTopic', index: 'mka_topic', width: 80, align: 'center'},
+            {label: '活动主题', name: 'mkaTopic', index: 'mka_topic', width: 80, align: 'center',
+                formatter:function(value){
+                    var mkaTopicName ;
+                    if(value === 'lscx')
+                        mkaTopicName = marketing.lscx;
+                    else if(value === 'yhq')
+                        mkaTopicName = marketing.yhq;
+                    else if(value === 'rchd')
+                        mkaTopicName = marketing.rchd;
+                    else if(value === 'mysy')
+                        mkaTopicName = marketing.mysy;
+                    else if(value === 'mj')
+                        mkaTopicName = marketing.mj;
+                    else if(value === 'mz')
+                        mkaTopicName = marketing.mz;
+                    else if(value === 'dz')
+                        mkaTopicName = marketing.dz;
+                    else if(value === 'zhjsp')
+                        mkaTopicName = marketing.zhjsp;
+                    return mkaTopicName == null? value : mkaTopicName;
+                }},
             {label: '商户名称', name: 'merchName', width: 80, align: 'center'},
             {label: '第三方商户', name: 'thirdMerchName', width: 80, align: 'center'},
+            {label: '门店编号', name: 'storeId', width: 80, align: 'center',hidden: true},
             {label: '活动门店', name: 'storeName', width: 80, align: 'center'},
             {label: '是否启用', name: 'mkaStatus', index: 'mka_status', width: 60, align: 'center',
                 formatter: function (value) {
@@ -77,8 +104,15 @@ $(function () {
                     return '';
                 }
             },
-            {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', width: 80, align: 'center'}
-        ],
+            {label: '提前结束时间', name: 'mkdEndEarlyTime', index: 'mkd_end_early_time', width: 80, align: 'center'},
+            {label: '操作', width: 80, align: 'center',
+                formatter: function (value, col, row) {
+                    htmlStr = "<button class='btn btn-outline btn-primary' " +
+                        "onclick='vm.showMkactivitiesGoods(\""+row.mkaId+"\",\""+row.storeId+"\",\""+row.mkaTopic+"\")'>管理商品</button>";
+
+                    return htmlStr;
+                }
+            }],
         viewrecords: true,
         height: 550,
         width:1680,
@@ -86,7 +120,7 @@ $(function () {
         rowList: [10, 30, 50],
         rownumbers: true,
         rownumWidth: 25,
-        autowidth: true,
+        autowidth: false,
         multiselect: true,
         pager: "#jqGridPagerOrder",
         jsonReader: {
@@ -136,7 +170,34 @@ let vm = new Vue({
         storeList: {},//门店
         mkaStartTime: '',//开始时间
         mkdEndTime: '',//结束时间
-        mkdEndEarlyTime: ''//提前结束时间
+        mkdEndEarlyTime: '',//提前结束时间,
+        marketings:[
+            {
+                id: 'lscx',
+                name: '临时促销'
+            }, {
+                id: 'yhq',
+                name: '优惠券'
+            }, {
+                id: 'rchd',
+                name: '日常活动'
+            }, {
+                id: 'mysy',
+                name: '买一送一'
+            }, {
+                id: 'mj',
+                name: '满减'
+            }, {
+                id: 'mz',
+                name: '满赠'
+            }, {
+                id: 'dz',
+                name: '打折'
+            }, {
+                id: 'zhjsp',
+                name: '组合价商品'
+            }
+        ],
 	},
 	methods: {
 		query: function () {
@@ -274,6 +335,8 @@ let vm = new Vue({
             };
             vm.isMkdEndEarlyTimeShow = false;
 
+
+
             vm.getMerchList();
         },
         getMerchList: function() {
@@ -420,6 +483,29 @@ let vm = new Vue({
                 return;
             }
             return grid.getGridParam("selarrrow");
+        },
+
+        // 管理商品
+        showMkactivitiesGoods: function(mkaId,storeId,mkaTopic){
+            var url ;
+            // "/mk/mkstorecampminus.html"
+            if(mkaTopic === 'lscx')
+                url = "/mk/mkactivitiespromotion.html";
+            else if(mkaTopic === 'yhq')
+                url = "/mk/mkactivitiescoupon.html";
+            else if(mkaTopic === 'rchd')
+                url = "/mk/mkdailyactivities.html";
+            else if(mkaTopic === 'mysy')
+                url = "/mk/mkactivitiesgetonefreegoods.html";
+            else if(mkaTopic === 'mj')
+                url = "/mk/mkactivitiesfullreduction.html";
+            else if(mkaTopic === 'mz')
+                url = "/mk/mkactivitiesfullgift.html";
+            else if(mkaTopic === 'dz')
+                url = "/mk/mkactivitiesdiscount.html";
+            else if(mkaTopic === 'zhjsp')
+                url = "/mk/mkactivitiescombinationprice.html";
+            window.location.href =  url ; ;
         }
 	}
 });

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

@@ -0,0 +1,151 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkdailyactivities/list',
+        datatype: "json",
+        colModel: [
+			{label: 'mdaId', name: 'mdaId', index: 'mda_id', key: true, hidden: true},
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
+			{label: '日常价', name: 'dailyPrice', index: 'daily_price', width: 80},
+			{label: '活动价格', name: 'activityPrice', index: 'activity_price', width: 80},
+			{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: '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}],
+		viewrecords: true,
+        height: 550,
+        rowNum: 10,
+        rowList: [10, 30, 50],
+        rownumbers: true,
+        rownumWidth: 25,
+        autowidth: true,
+        multiselect: true,
+        pager: "#jqGridPager",
+        jsonReader: {
+            root: "page.list",
+            page: "page.currPage",
+            total: "page.totalPage",
+            records: "page.totalCount"
+        },
+        prmNames: {
+            page: "page",
+            rows: "limit",
+            order: "order"
+        },
+        gridComplete: function () {
+            $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
+        }
+    });
+});
+
+let vm = new Vue({
+	el: '#rrapp',
+	data: {
+        showList: true,
+        title: null,
+		mkDailyActivities: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkDailyActivities = {};
+		},
+		update: function (event) {
+            let mdaId = getSelectedRow();
+			if (mdaId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(mdaId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkDailyActivities.mdaId == null ? "../mkdailyactivities/save" : "../mkdailyactivities/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkDailyActivities),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let mdaIds = getSelectedRows();
+			if (mdaIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkdailyactivities/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(mdaIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(mdaId){
+			$.get("../mkdailyactivities/info/"+mdaId, function (r) {
+                vm.mkDailyActivities = r.mkDailyActivities;
+            });
+		},
+        reloadSearch: function() {
+            vm.q = {
+                name: ''
+            }
+            vm.reload();
+		},
+		reload: function (event) {
+			vm.showList = true;
+            let page = $("#jqGrid").jqGrid('getGridParam', 'page');
+			$("#jqGrid").jqGrid('setGridParam', {
+                postData: {'name': vm.q.name},
+                page: page
+            }).trigger("reloadGrid");
+            vm.handleReset('formValidate');
+		},
+        handleSubmit: function (name) {
+            handleSubmitValidate(this, name, function () {
+                vm.saveOrUpdate()
+            });
+        },
+        handleReset: function (name) {
+            handleResetForm(this, name);
+        }
+	}
+});

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

@@ -32,8 +32,8 @@ let vm = new Vue({
     },
     methods: {
         changeHead:function(){
-            console.log(vm.q)
-            console.log(vm.selectButtonDisabled)
+            // console.log(vm.q)
+            // console.log(vm.selectButtonDisabled)
             if (vm.q.isHead=='0'){
                 vm.pdfTypes=[ {id: '36',
                     name: '36规格'}
@@ -66,34 +66,35 @@ let vm = new Vue({
             }
 
         },
-		selectLabelHead: function () {
-
-
-
-
-			alert("selectLabelHead")
-		},
+		// selectLabelHead: function () {
+        //
+        //
+        //
+        //
+		// 	alert("selectLabelHead")
+		// },
 
 		exportPdf: function () {
-
-            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);
-
-            $.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) {
-                vm.mall2OrderingEarlyWarningReminds = r.mall2OrderingEarlyWarningReminds;
-            });
-        },
-        barCodeEnter:function() {
             if (vm.q.storeId==''){
                 alert("请先选择门店")
                 return;
             }
-            if (vm.q.sku==''){
-                alert("请先输入sku")
+            if (vm.q.sku=='' && vm.q.barCode==''){
+                alert("请先输入sku或者条形码")
                 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);
+
+            $.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) {
+                console.log(r)
+                alert(r)
+            });
+		},
+        barCodeEnter:function () {
             this.exportPdf();
         }
+
 	},
     mounted() {