活动的相关类

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

@@ -0,0 +1,107 @@
+package com.kmall.admin.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+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.MkActivitiesCombinationPriceEntity;
+import com.kmall.admin.service.MkActivitiesCombinationPriceService;
+
+/**
+ * 营销活动-组合价Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+@Controller
+@RequestMapping("mkactivitiescombinationprice")
+public class MkActivitiesCombinationPriceController {
+    @Autowired
+    private MkActivitiesCombinationPriceService mkActivitiesCombinationPriceService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiescombinationprice:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesCombinationPriceEntity> mkActivitiesCombinationPriceList = mkActivitiesCombinationPriceService.queryList(query);
+        int total = mkActivitiesCombinationPriceService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesCombinationPriceList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{macpId}")
+    @RequiresPermissions("mkactivitiescombinationprice:info")
+    @ResponseBody
+    public R info(@PathVariable("macpId") Long macpId) {
+        MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice = mkActivitiesCombinationPriceService.queryObject(macpId);
+
+        return R.ok().put("mkActivitiesCombinationPrice", mkActivitiesCombinationPrice);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiescombinationprice:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
+        mkActivitiesCombinationPriceService.save(mkActivitiesCombinationPrice);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiescombinationprice:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
+        mkActivitiesCombinationPriceService.update(mkActivitiesCombinationPrice);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiescombinationprice:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]macpIds) {
+        mkActivitiesCombinationPriceService.deleteBatch(macpIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesCombinationPriceEntity> list = mkActivitiesCombinationPriceService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesDiscountController.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.MkActivitiesDiscountEntity;
+import com.kmall.admin.service.MkActivitiesDiscountService;
+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-22 09:44:34
+ */
+@Controller
+@RequestMapping("mkactivitiesdiscount")
+public class MkActivitiesDiscountController {
+    @Autowired
+    private MkActivitiesDiscountService mkActivitiesDiscountService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiesdiscount:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesDiscountEntity> mkActivitiesDiscountList = mkActivitiesDiscountService.queryList(query);
+        int total = mkActivitiesDiscountService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesDiscountList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{madId}")
+    @RequiresPermissions("mkactivitiesdiscount:info")
+    @ResponseBody
+    public R info(@PathVariable("madId") Long madId) {
+        MkActivitiesDiscountEntity mkActivitiesDiscount = mkActivitiesDiscountService.queryObject(madId);
+
+        return R.ok().put("mkActivitiesDiscount", mkActivitiesDiscount);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiesdiscount:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesDiscountEntity mkActivitiesDiscount) {
+        mkActivitiesDiscountService.save(mkActivitiesDiscount);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiesdiscount:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesDiscountEntity mkActivitiesDiscount) {
+        mkActivitiesDiscountService.update(mkActivitiesDiscount);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiesdiscount:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]madIds) {
+        mkActivitiesDiscountService.deleteBatch(madIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesDiscountEntity> list = mkActivitiesDiscountService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/controller/MkActivitiesFullGiftController.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.MkActivitiesFullGiftEntity;
+import com.kmall.admin.service.MkActivitiesFullGiftService;
+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-22 09:44:34
+ */
+@Controller
+@RequestMapping("mkactivitiesfullgift")
+public class MkActivitiesFullGiftController {
+    @Autowired
+    private MkActivitiesFullGiftService mkActivitiesFullGiftService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiesfullgift:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesFullGiftEntity> mkActivitiesFullGiftList = mkActivitiesFullGiftService.queryList(query);
+        int total = mkActivitiesFullGiftService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesFullGiftList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{mafrId}")
+    @RequiresPermissions("mkactivitiesfullgift:info")
+    @ResponseBody
+    public R info(@PathVariable("mafrId") Long mafrId) {
+        MkActivitiesFullGiftEntity mkActivitiesFullGift = mkActivitiesFullGiftService.queryObject(mafrId);
+
+        return R.ok().put("mkActivitiesFullGift", mkActivitiesFullGift);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiesfullgift:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesFullGiftEntity mkActivitiesFullGift) {
+        mkActivitiesFullGiftService.save(mkActivitiesFullGift);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiesfullgift:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesFullGiftEntity mkActivitiesFullGift) {
+        mkActivitiesFullGiftService.update(mkActivitiesFullGift);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiesfullgift:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]mafrIds) {
+        mkActivitiesFullGiftService.deleteBatch(mafrIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesFullGiftEntity> list = mkActivitiesFullGiftService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

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

@@ -0,0 +1,109 @@
+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.MkActivitiesFullReductionEntity;
+import com.kmall.admin.service.MkActivitiesFullReductionService;
+import com.kmall.common.utils.PageUtils;
+import com.kmall.common.utils.Query;
+import com.kmall.common.utils.R;
+
+/**
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
+活动方式
+满减，满xxx元立减xx元（xController
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+@Controller
+@RequestMapping("mkactivitiesfullreduction")
+public class MkActivitiesFullReductionController {
+    @Autowired
+    private MkActivitiesFullReductionService mkActivitiesFullReductionService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiesfullreduction:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesFullReductionEntity> mkActivitiesFullReductionList = mkActivitiesFullReductionService.queryList(query);
+        int total = mkActivitiesFullReductionService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesFullReductionList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{mafrId}")
+    @RequiresPermissions("mkactivitiesfullreduction:info")
+    @ResponseBody
+    public R info(@PathVariable("mafrId") Long mafrId) {
+        MkActivitiesFullReductionEntity mkActivitiesFullReduction = mkActivitiesFullReductionService.queryObject(mafrId);
+
+        return R.ok().put("mkActivitiesFullReduction", mkActivitiesFullReduction);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiesfullreduction:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
+        mkActivitiesFullReductionService.save(mkActivitiesFullReduction);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiesfullreduction:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
+        mkActivitiesFullReductionService.update(mkActivitiesFullReduction);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiesfullreduction:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]mafrIds) {
+        mkActivitiesFullReductionService.deleteBatch(mafrIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesFullReductionEntity> list = mkActivitiesFullReductionService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

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

@@ -0,0 +1,109 @@
+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.MkActivitiesGetOneFreeGoodsEntity;
+import com.kmall.admin.service.MkActivitiesGetOneFreeGoodsService;
+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-22 09:44:34
+ */
+@Controller
+@RequestMapping("mkactivitiesgetonefreegoods")
+public class MkActivitiesGetOneFreeGoodsController {
+    @Autowired
+    private MkActivitiesGetOneFreeGoodsService mkActivitiesGetOneFreeGoodsService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiesgetonefreegoods:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesGetOneFreeGoodsEntity> mkActivitiesGetOneFreeGoodsList = mkActivitiesGetOneFreeGoodsService.queryList(query);
+        int total = mkActivitiesGetOneFreeGoodsService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesGetOneFreeGoodsList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{mkaFreeId}")
+    @RequiresPermissions("mkactivitiesgetonefreegoods:info")
+    @ResponseBody
+    public R info(@PathVariable("mkaFreeId") Long mkaFreeId) {
+        MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods = mkActivitiesGetOneFreeGoodsService.queryObject(mkaFreeId);
+
+        return R.ok().put("mkActivitiesGetOneFreeGoods", mkActivitiesGetOneFreeGoods);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiesgetonefreegoods:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
+        mkActivitiesGetOneFreeGoodsService.save(mkActivitiesGetOneFreeGoods);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiesgetonefreegoods:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
+        mkActivitiesGetOneFreeGoodsService.update(mkActivitiesGetOneFreeGoods);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiesgetonefreegoods:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]mkaFreeIds) {
+        mkActivitiesGetOneFreeGoodsService.deleteBatch(mkaFreeIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesGetOneFreeGoodsEntity> list = mkActivitiesGetOneFreeGoodsService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.MkActivitiesCombinationPriceEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 营销活动-组合价Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public interface MkActivitiesCombinationPriceDao extends BaseDao<MkActivitiesCombinationPriceEntity> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.MkActivitiesDiscountEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 营销活动-全场打折Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public interface MkActivitiesDiscountDao extends BaseDao<MkActivitiesDiscountEntity> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao;
+
+import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 营销活动-满赠Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public interface MkActivitiesFullGiftDao extends BaseDao<MkActivitiesFullGiftEntity> {
+
+}

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

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

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

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

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

@@ -0,0 +1,223 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 营销活动-组合价实体
+ * 表名 mk_activities_combination_price
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public class MkActivitiesCombinationPriceEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long macpId;
+    /**
+     * 组合条码
+     */
+    private String combinationBarcode;
+    /**
+     * 商品编码
+     */
+    private String goodsSn;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 组合的产品数量
+     */
+    private String combinationNum;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 组合价
+     */
+    private BigDecimal combinedPrice;
+    /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMacpId(Long macpId) {
+        this.macpId = macpId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMacpId() {
+        return macpId;
+    }
+    /**
+     * 设置：组合条码
+     */
+    public void setCombinationBarcode(String combinationBarcode) {
+        this.combinationBarcode = combinationBarcode;
+    }
+
+    /**
+     * 获取：组合条码
+     */
+    public String getCombinationBarcode() {
+        return combinationBarcode;
+    }
+    /**
+     * 设置：商品编码
+     */
+    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 setCombinationNum(String combinationNum) {
+        this.combinationNum = combinationNum;
+    }
+
+    /**
+     * 获取：组合的产品数量
+     */
+    public String getCombinationNum() {
+        return combinationNum;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取：产品中文名
+     */
+    public String getProductName() {
+        return productName;
+    }
+    /**
+     * 设置：组合价
+     */
+    public void setCombinedPrice(BigDecimal combinedPrice) {
+        this.combinedPrice = combinedPrice;
+    }
+
+    /**
+     * 获取：组合价
+     */
+    public BigDecimal getCombinedPrice() {
+        return combinedPrice;
+    }
+    /**
+     * 设置：营销活动编号
+     */
+    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/entity/MkActivitiesDiscountEntity.java

@@ -0,0 +1,257 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 营销活动-全场打折实体
+ * 表名 mk_activities_discount
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public class MkActivitiesDiscountEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long madId;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 活动价格
+     */
+    private BigDecimal activityPrice;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 商品编码
+     */
+    private String goodsSn;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 商品品牌
+     */
+    private String productBrand;
+    /**
+     * 商品系列
+     */
+    private String productSeries;
+    /**
+     * 折扣
+     */
+    private BigDecimal discount;
+    /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMadId(Long madId) {
+        this.madId = madId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMadId() {
+        return madId;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    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 setDiscount(BigDecimal discount) {
+        this.discount = discount;
+    }
+
+    /**
+     * 获取：折扣
+     */
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+    /**
+     * 设置：营销活动编号
+     */
+    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/entity/MkActivitiesFullGiftEntity.java

@@ -0,0 +1,240 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 营销活动-满赠实体
+ * 表名 mk_activities_full_gift
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public class MkActivitiesFullGiftEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long mafrId;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 商品编码
+     */
+    private String goodsSn;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 商品品牌
+     */
+    private String productBrand;
+    /**
+     * 商品系列
+     */
+    private String productSeries;
+    /**
+     * 满足条件金额
+     */
+    private BigDecimal qualifiedAmount;
+    /**
+     * 赠品条码
+     */
+    private String giftBarcode;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMafrId(Long mafrId) {
+        this.mafrId = mafrId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMafrId() {
+        return mafrId;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取：产品中文名
+     */
+    public String getProductName() {
+        return productName;
+    }
+    /**
+     * 设置：门店编号
+     */
+    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 setQualifiedAmount(BigDecimal qualifiedAmount) {
+        this.qualifiedAmount = qualifiedAmount;
+    }
+
+    /**
+     * 获取：满足条件金额
+     */
+    public BigDecimal getQualifiedAmount() {
+        return qualifiedAmount;
+    }
+    /**
+     * 设置：赠品条码
+     */
+    public void setGiftBarcode(String giftBarcode) {
+        this.giftBarcode = giftBarcode;
+    }
+
+    /**
+     * 获取：赠品条码
+     */
+    public String getGiftBarcode() {
+        return giftBarcode;
+    }
+    /**
+     * 设置：创建时间
+     */
+    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/MkActivitiesFullReductionEntity.java

@@ -0,0 +1,242 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
+活动方式
+满减，满xxx元立减xx元（x实体
+ * 表名 mk_activities_full_reduction
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public class MkActivitiesFullReductionEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long mafrId;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 商品编码
+     */
+    private String goodsSn;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 商品品牌
+     */
+    private String productBrand;
+    /**
+     * 商品系列
+     */
+    private String productSeries;
+    /**
+     * 满足条件金额
+     */
+    private BigDecimal qualifiedAmount;
+    /**
+     * 减扣金额
+     */
+    private BigDecimal deductionAmount;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMafrId(Long mafrId) {
+        this.mafrId = mafrId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMafrId() {
+        return mafrId;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取：产品中文名
+     */
+    public String getProductName() {
+        return productName;
+    }
+    /**
+     * 设置：门店编号
+     */
+    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 setQualifiedAmount(BigDecimal qualifiedAmount) {
+        this.qualifiedAmount = qualifiedAmount;
+    }
+
+    /**
+     * 获取：满足条件金额
+     */
+    public BigDecimal getQualifiedAmount() {
+        return qualifiedAmount;
+    }
+    /**
+     * 设置：减扣金额
+     */
+    public void setDeductionAmount(BigDecimal deductionAmount) {
+        this.deductionAmount = deductionAmount;
+    }
+
+    /**
+     * 获取：减扣金额
+     */
+    public BigDecimal getDeductionAmount() {
+        return deductionAmount;
+    }
+    /**
+     * 设置：创建时间
+     */
+    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/MkActivitiesGetOneFreeGoodsEntity.java

@@ -0,0 +1,294 @@
+package com.kmall.admin.entity;
+
+import java.io.Serializable;
+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
+ */
+public class MkActivitiesGetOneFreeGoodsEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long mkaFreeId;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 每日最低价
+     */
+    private BigDecimal edlp;
+    /**
+     * 建议零售价
+     */
+    private BigDecimal suggestedRetailPrice;
+    /**
+     * 活动价格
+     */
+    private BigDecimal activityPrice;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 商品编码
+     */
+    private String goodsSn;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 商品品牌
+     */
+    private String productBrand;
+    /**
+     * 商品系列
+     */
+    private String productSeries;
+    /**
+     * 赠品条码
+     */
+    private String giftBarcode;
+    /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMkaFreeId(Long mkaFreeId) {
+        this.mkaFreeId = mkaFreeId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMkaFreeId() {
+        return mkaFreeId;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取：产品中文名
+     */
+    public String getProductName() {
+        return productName;
+    }
+    /**
+     * 设置：每日最低价
+     */
+    public void setEdlp(BigDecimal edlp) {
+        this.edlp = edlp;
+    }
+
+    /**
+     * 获取：每日最低价
+     */
+    public BigDecimal getEdlp() {
+        return edlp;
+    }
+    /**
+     * 设置：建议零售价
+     */
+    public void setSuggestedRetailPrice(BigDecimal suggestedRetailPrice) {
+        this.suggestedRetailPrice = suggestedRetailPrice;
+    }
+
+    /**
+     * 获取：建议零售价
+     */
+    public BigDecimal getSuggestedRetailPrice() {
+        return suggestedRetailPrice;
+    }
+    /**
+     * 设置：活动价格
+     */
+    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 setGiftBarcode(String giftBarcode) {
+        this.giftBarcode = giftBarcode;
+    }
+
+    /**
+     * 获取：赠品条码
+     */
+    public String getGiftBarcode() {
+        return giftBarcode;
+    }
+    /**
+     * 设置：营销活动编号
+     */
+    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

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.MkActivitiesCombinationPriceEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 营销活动-组合价Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public interface MkActivitiesCombinationPriceService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param macpId 主键
+     * @return 实体
+     */
+    MkActivitiesCombinationPriceEntity queryObject(Long macpId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkActivitiesCombinationPriceEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkActivitiesCombinationPrice 实体
+     * @return 保存条数
+     */
+    int save(MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkActivitiesCombinationPrice 实体
+     * @return 更新条数
+     */
+    int update(MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice);
+
+    /**
+     * 根据主键删除
+     *
+     * @param macpId
+     * @return 删除条数
+     */
+    int delete(Long macpId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param macpIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]macpIds);
+}

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

@@ -0,0 +1,72 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.MkActivitiesDiscountEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 营销活动-全场打折Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public interface MkActivitiesDiscountService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    MkActivitiesDiscountEntity queryObject(Long madId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkActivitiesDiscountEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkActivitiesDiscount 实体
+     * @return 保存条数
+     */
+    int save(MkActivitiesDiscountEntity mkActivitiesDiscount);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkActivitiesDiscount 实体
+     * @return 更新条数
+     */
+    int update(MkActivitiesDiscountEntity mkActivitiesDiscount);
+
+    /**
+     * 根据主键删除
+     *
+     * @param madId
+     * @return 删除条数
+     */
+    int delete(Long madId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param madIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]madIds);
+}

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

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

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

@@ -0,0 +1,74 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
+活动方式
+满减，满xxx元立减xx元（xService接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public interface MkActivitiesFullReductionService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    MkActivitiesFullReductionEntity queryObject(Long mafrId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkActivitiesFullReductionEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkActivitiesFullReduction 实体
+     * @return 保存条数
+     */
+    int save(MkActivitiesFullReductionEntity mkActivitiesFullReduction);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkActivitiesFullReduction 实体
+     * @return 更新条数
+     */
+    int update(MkActivitiesFullReductionEntity mkActivitiesFullReduction);
+
+    /**
+     * 根据主键删除
+     *
+     * @param mafrId
+     * @return 删除条数
+     */
+    int delete(Long mafrId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param mafrIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]mafrIds);
+}

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

@@ -0,0 +1,75 @@
+package com.kmall.admin.service;
+
+import com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 买一送一商品配置表
+
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
+                                                     -&#Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+public interface MkActivitiesGetOneFreeGoodsService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    MkActivitiesGetOneFreeGoodsEntity queryObject(Long mkaFreeId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkActivitiesGetOneFreeGoodsEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkActivitiesGetOneFreeGoods 实体
+     * @return 保存条数
+     */
+    int save(MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkActivitiesGetOneFreeGoods 实体
+     * @return 更新条数
+     */
+    int update(MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods);
+
+    /**
+     * 根据主键删除
+     *
+     * @param mkaFreeId
+     * @return 删除条数
+     */
+    int delete(Long mkaFreeId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param mkaFreeIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]mkaFreeIds);
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesCombinationPriceServiceImpl.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.MkActivitiesCombinationPriceDao;
+import com.kmall.admin.entity.MkActivitiesCombinationPriceEntity;
+import com.kmall.admin.service.MkActivitiesCombinationPriceService;
+
+/**
+ * 营销活动-组合价Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+@Service("mkActivitiesCombinationPriceService")
+public class MkActivitiesCombinationPriceServiceImpl implements MkActivitiesCombinationPriceService {
+    @Autowired
+    private MkActivitiesCombinationPriceDao mkActivitiesCombinationPriceDao;
+
+    @Override
+    public MkActivitiesCombinationPriceEntity queryObject(Long macpId) {
+        return mkActivitiesCombinationPriceDao.queryObject(macpId);
+    }
+
+    @Override
+    public List<MkActivitiesCombinationPriceEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesCombinationPriceDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesCombinationPriceDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
+        return mkActivitiesCombinationPriceDao.save(mkActivitiesCombinationPrice);
+    }
+
+    @Override
+    public int update(MkActivitiesCombinationPriceEntity mkActivitiesCombinationPrice) {
+        return mkActivitiesCombinationPriceDao.update(mkActivitiesCombinationPrice);
+    }
+
+    @Override
+    public int delete(Long macpId) {
+        return mkActivitiesCombinationPriceDao.delete(macpId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]macpIds) {
+        return mkActivitiesCombinationPriceDao.deleteBatch(macpIds);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesDiscountServiceImpl.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.MkActivitiesDiscountDao;
+import com.kmall.admin.entity.MkActivitiesDiscountEntity;
+import com.kmall.admin.service.MkActivitiesDiscountService;
+
+/**
+ * 营销活动-全场打折Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+@Service("mkActivitiesDiscountService")
+public class MkActivitiesDiscountServiceImpl implements MkActivitiesDiscountService {
+    @Autowired
+    private MkActivitiesDiscountDao mkActivitiesDiscountDao;
+
+    @Override
+    public MkActivitiesDiscountEntity queryObject(Long madId) {
+        return mkActivitiesDiscountDao.queryObject(madId);
+    }
+
+    @Override
+    public List<MkActivitiesDiscountEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesDiscountDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesDiscountDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesDiscountEntity mkActivitiesDiscount) {
+        return mkActivitiesDiscountDao.save(mkActivitiesDiscount);
+    }
+
+    @Override
+    public int update(MkActivitiesDiscountEntity mkActivitiesDiscount) {
+        return mkActivitiesDiscountDao.update(mkActivitiesDiscount);
+    }
+
+    @Override
+    public int delete(Long madId) {
+        return mkActivitiesDiscountDao.delete(madId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]madIds) {
+        return mkActivitiesDiscountDao.deleteBatch(madIds);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/impl/MkActivitiesFullGiftServiceImpl.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.MkActivitiesFullGiftDao;
+import com.kmall.admin.entity.MkActivitiesFullGiftEntity;
+import com.kmall.admin.service.MkActivitiesFullGiftService;
+
+/**
+ * 营销活动-满赠Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+@Service("mkActivitiesFullGiftService")
+public class MkActivitiesFullGiftServiceImpl implements MkActivitiesFullGiftService {
+    @Autowired
+    private MkActivitiesFullGiftDao mkActivitiesFullGiftDao;
+
+    @Override
+    public MkActivitiesFullGiftEntity queryObject(Long mafrId) {
+        return mkActivitiesFullGiftDao.queryObject(mafrId);
+    }
+
+    @Override
+    public List<MkActivitiesFullGiftEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesFullGiftDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesFullGiftDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesFullGiftEntity mkActivitiesFullGift) {
+        return mkActivitiesFullGiftDao.save(mkActivitiesFullGift);
+    }
+
+    @Override
+    public int update(MkActivitiesFullGiftEntity mkActivitiesFullGift) {
+        return mkActivitiesFullGiftDao.update(mkActivitiesFullGift);
+    }
+
+    @Override
+    public int delete(Long mafrId) {
+        return mkActivitiesFullGiftDao.delete(mafrId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]mafrIds) {
+        return mkActivitiesFullGiftDao.deleteBatch(mafrIds);
+    }
+}

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

@@ -0,0 +1,61 @@
+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.MkActivitiesFullReductionDao;
+import com.kmall.admin.entity.MkActivitiesFullReductionEntity;
+import com.kmall.admin.service.MkActivitiesFullReductionService;
+
+/**
+ * 商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
+活动方式
+满减，满xxx元立减xx元（xService实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+@Service("mkActivitiesFullReductionService")
+public class MkActivitiesFullReductionServiceImpl implements MkActivitiesFullReductionService {
+    @Autowired
+    private MkActivitiesFullReductionDao mkActivitiesFullReductionDao;
+
+    @Override
+    public MkActivitiesFullReductionEntity queryObject(Long mafrId) {
+        return mkActivitiesFullReductionDao.queryObject(mafrId);
+    }
+
+    @Override
+    public List<MkActivitiesFullReductionEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesFullReductionDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesFullReductionDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
+        return mkActivitiesFullReductionDao.save(mkActivitiesFullReduction);
+    }
+
+    @Override
+    public int update(MkActivitiesFullReductionEntity mkActivitiesFullReduction) {
+        return mkActivitiesFullReductionDao.update(mkActivitiesFullReduction);
+    }
+
+    @Override
+    public int delete(Long mafrId) {
+        return mkActivitiesFullReductionDao.delete(mafrId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]mafrIds) {
+        return mkActivitiesFullReductionDao.deleteBatch(mafrIds);
+    }
+}

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

@@ -0,0 +1,62 @@
+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.MkActivitiesGetOneFreeGoodsDao;
+import com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity;
+import com.kmall.admin.service.MkActivitiesGetOneFreeGoodsService;
+
+/**
+ * 买一送一商品配置表
+
+说明：购买商品条码，购买商品品牌，购买商品系列三列不可以同是为空
+                                                     -&#Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2020-09-22 09:44:34
+ */
+@Service("mkActivitiesGetOneFreeGoodsService")
+public class MkActivitiesGetOneFreeGoodsServiceImpl implements MkActivitiesGetOneFreeGoodsService {
+    @Autowired
+    private MkActivitiesGetOneFreeGoodsDao mkActivitiesGetOneFreeGoodsDao;
+
+    @Override
+    public MkActivitiesGetOneFreeGoodsEntity queryObject(Long mkaFreeId) {
+        return mkActivitiesGetOneFreeGoodsDao.queryObject(mkaFreeId);
+    }
+
+    @Override
+    public List<MkActivitiesGetOneFreeGoodsEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesGetOneFreeGoodsDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesGetOneFreeGoodsDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
+        return mkActivitiesGetOneFreeGoodsDao.save(mkActivitiesGetOneFreeGoods);
+    }
+
+    @Override
+    public int update(MkActivitiesGetOneFreeGoodsEntity mkActivitiesGetOneFreeGoods) {
+        return mkActivitiesGetOneFreeGoodsDao.update(mkActivitiesGetOneFreeGoods);
+    }
+
+    @Override
+    public int delete(Long mkaFreeId) {
+        return mkActivitiesGetOneFreeGoodsDao.delete(mkaFreeId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]mkaFreeIds) {
+        return mkActivitiesGetOneFreeGoodsDao.deleteBatch(mkaFreeIds);
+    }
+}

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesCombinationPriceDao.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.MkActivitiesCombinationPriceDao">
+
+    <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="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.MkActivitiesCombinationPriceEntity">
+		select
+			`macp_id`,
+			`combination_barcode`,
+			`goods_sn`,
+			`barcode`,
+			`combination_num`,
+			`product_name`,
+			`combined_price`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_combination_price
+		where macp_id = #{id}
+	</select>
+
+	<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`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_combination_price
+		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 macp_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_combination_price
+		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.MkActivitiesCombinationPriceEntity" useGeneratedKeys="true" keyProperty="macpId">
+		insert into mk_activities_combination_price(
+			`combination_barcode`,
+			`goods_sn`,
+			`barcode`,
+			`combination_num`,
+			`product_name`,
+			`combined_price`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{combinationBarcode},
+			#{goodsSn},
+			#{barcode},
+			#{combinationNum},
+			#{productName},
+			#{combinedPrice},
+			#{mkaId},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<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="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 macp_id = #{macpId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_activities_combination_price where macp_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_activities_combination_price where macp_id in
+		<foreach item="macpId" collection="array" open="(" separator="," close=")">
+			#{macpId}
+		</foreach>
+	</delete>
+
+</mapper>

kmall-admin/src/main/resources/mybatis/mapper/MkActivitiesDiscountDao.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.MkActivitiesDiscountDao">
+
+    <resultMap type="com.kmall.admin.entity.MkActivitiesDiscountEntity" id="mkActivitiesDiscountMap">
+        <result property="madId" column="mad_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="discount" column="discount"/>
+        <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.MkActivitiesDiscountEntity">
+		select
+			`mad_id`,
+			`product_name`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`discount`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_discount
+		where mad_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MkActivitiesDiscountEntity">
+		select
+    		`mad_id`,
+    		`product_name`,
+    		`activity_price`,
+    		`shop_sn`,
+    		`goods_sn`,
+    		`barcode`,
+    		`product_brand`,
+    		`product_series`,
+    		`discount`,
+    		`mka_id`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_discount
+		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 mad_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_discount
+		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.MkActivitiesDiscountEntity" useGeneratedKeys="true" keyProperty="madId">
+		insert into mk_activities_discount(
+			`product_name`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`discount`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{productName},
+			#{activityPrice},
+			#{shopSn},
+			#{goodsSn},
+			#{barcode},
+			#{productBrand},
+			#{productSeries},
+			#{discount},
+			#{mkaId},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.MkActivitiesDiscountEntity">
+		update mk_activities_discount
+		<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="discount != null">`discount` = #{discount}, </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 mad_id = #{madId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_activities_discount where mad_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_activities_discount where mad_id in
+		<foreach item="madId" collection="array" open="(" separator="," close=")">
+			#{madId}
+		</foreach>
+	</delete>
+
+</mapper>

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

@@ -0,0 +1,141 @@
+<?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.MkActivitiesFullGiftDao">
+
+    <resultMap type="com.kmall.admin.entity.MkActivitiesFullGiftEntity" id="mkActivitiesFullGiftMap">
+        <result property="mafrId" column="mafr_id"/>
+        <result property="productName" column="product_name"/>
+        <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="qualifiedAmount" column="qualified_amount"/>
+        <result property="giftBarcode" column="gift_barcode"/>
+        <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.MkActivitiesFullGiftEntity">
+		select
+			`mafr_id`,
+			`product_name`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`qualified_amount`,
+			`gift_barcode`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_full_gift
+		where mafr_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MkActivitiesFullGiftEntity">
+		select
+    		`mafr_id`,
+    		`product_name`,
+    		`shop_sn`,
+    		`goods_sn`,
+    		`barcode`,
+    		`product_brand`,
+    		`product_series`,
+    		`qualified_amount`,
+    		`gift_barcode`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_full_gift
+		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 mafr_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_full_gift
+		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.MkActivitiesFullGiftEntity" useGeneratedKeys="true" keyProperty="mafrId">
+		insert into mk_activities_full_gift(
+			`product_name`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`qualified_amount`,
+			`gift_barcode`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{productName},
+			#{shopSn},
+			#{goodsSn},
+			#{barcode},
+			#{productBrand},
+			#{productSeries},
+			#{qualifiedAmount},
+			#{giftBarcode},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.MkActivitiesFullGiftEntity">
+		update mk_activities_full_gift
+		<set>
+			<if test="productName != null">`product_name` = #{productName}, </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="qualifiedAmount != null">`qualified_amount` = #{qualifiedAmount}, </if>
+			<if test="giftBarcode != null">`gift_barcode` = #{giftBarcode}, </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 mafr_id = #{mafrId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_activities_full_gift where mafr_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_activities_full_gift where mafr_id in
+		<foreach item="mafrId" collection="array" open="(" separator="," close=")">
+			#{mafrId}
+		</foreach>
+	</delete>
+
+</mapper>

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

@@ -0,0 +1,141 @@
+<?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.MkActivitiesFullReductionDao">
+
+    <resultMap type="com.kmall.admin.entity.MkActivitiesFullReductionEntity" id="mkActivitiesFullReductionMap">
+        <result property="mafrId" column="mafr_id"/>
+        <result property="productName" column="product_name"/>
+        <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="qualifiedAmount" column="qualified_amount"/>
+        <result property="deductionAmount" column="deduction_amount"/>
+        <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.MkActivitiesFullReductionEntity">
+		select
+			`mafr_id`,
+			`product_name`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`qualified_amount`,
+			`deduction_amount`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_full_reduction
+		where mafr_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MkActivitiesFullReductionEntity">
+		select
+    		`mafr_id`,
+    		`product_name`,
+    		`shop_sn`,
+    		`goods_sn`,
+    		`barcode`,
+    		`product_brand`,
+    		`product_series`,
+    		`qualified_amount`,
+    		`deduction_amount`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_full_reduction
+		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 mafr_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_full_reduction
+		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.MkActivitiesFullReductionEntity" useGeneratedKeys="true" keyProperty="mafrId">
+		insert into mk_activities_full_reduction(
+			`product_name`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`qualified_amount`,
+			`deduction_amount`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{productName},
+			#{shopSn},
+			#{goodsSn},
+			#{barcode},
+			#{productBrand},
+			#{productSeries},
+			#{qualifiedAmount},
+			#{deductionAmount},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.MkActivitiesFullReductionEntity">
+		update mk_activities_full_reduction
+		<set>
+			<if test="productName != null">`product_name` = #{productName}, </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="qualifiedAmount != null">`qualified_amount` = #{qualifiedAmount}, </if>
+			<if test="deductionAmount != null">`deduction_amount` = #{deductionAmount}, </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 mafr_id = #{mafrId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_activities_full_reduction where mafr_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_activities_full_reduction where mafr_id in
+		<foreach item="mafrId" collection="array" open="(" separator="," close=")">
+			#{mafrId}
+		</foreach>
+	</delete>
+
+</mapper>

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

@@ -0,0 +1,159 @@
+<?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.MkActivitiesGetOneFreeGoodsDao">
+
+    <resultMap type="com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity" id="mkActivitiesGetOneFreeGoodsMap">
+        <result property="mkaFreeId" column="mka_free_id"/>
+        <result property="productName" column="product_name"/>
+        <result property="edlp" column="edlp"/>
+        <result property="suggestedRetailPrice" column="suggested_retail_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="giftBarcode" column="gift_barcode"/>
+        <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.MkActivitiesGetOneFreeGoodsEntity">
+		select
+			`mka_free_id`,
+			`product_name`,
+			`edlp`,
+			`suggested_retail_price`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`gift_barcode`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_get_one_free_goods
+		where mka_free_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity">
+		select
+    		`mka_free_id`,
+    		`product_name`,
+    		`edlp`,
+    		`suggested_retail_price`,
+    		`activity_price`,
+    		`shop_sn`,
+    		`goods_sn`,
+    		`barcode`,
+    		`product_brand`,
+    		`product_series`,
+    		`gift_barcode`,
+    		`mka_id`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_get_one_free_goods
+		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 mka_free_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_get_one_free_goods
+		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.MkActivitiesGetOneFreeGoodsEntity" useGeneratedKeys="true" keyProperty="mkaFreeId">
+		insert into mk_activities_get_one_free_goods(
+			`product_name`,
+			`edlp`,
+			`suggested_retail_price`,
+			`activity_price`,
+			`shop_sn`,
+			`goods_sn`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`gift_barcode`,
+			`mka_id`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{productName},
+			#{edlp},
+			#{suggestedRetailPrice},
+			#{activityPrice},
+			#{shopSn},
+			#{goodsSn},
+			#{barcode},
+			#{productBrand},
+			#{productSeries},
+			#{giftBarcode},
+			#{mkaId},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+
+	<update id="update" parameterType="com.kmall.admin.entity.MkActivitiesGetOneFreeGoodsEntity">
+		update mk_activities_get_one_free_goods
+		<set>
+			<if test="productName != null">`product_name` = #{productName}, </if>
+			<if test="edlp != null">`edlp` = #{edlp}, </if>
+			<if test="suggestedRetailPrice != null">`suggested_retail_price` = #{suggestedRetailPrice}, </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="giftBarcode != null">`gift_barcode` = #{giftBarcode}, </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 mka_free_id = #{mkaFreeId}
+	</update>
+
+	<delete id="delete">
+		delete from mk_activities_get_one_free_goods where mka_free_id = #{value}
+	</delete>
+
+	<delete id="deleteBatch">
+		delete from mk_activities_get_one_free_goods where mka_free_id in
+		<foreach item="mkaFreeId" collection="array" open="(" separator="," close=")">
+			#{mkaFreeId}
+		</foreach>
+	</delete>
+
+</mapper>

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiescombinationprice.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("mkactivitiescombinationprice:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiescombinationprice:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiescombinationprice: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="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>
+            <Form-item label="条形码" prop="barcode">
+                <i-input v-model="mkActivitiesCombinationPrice.barcode" placeholder="条形码"/>
+            </Form-item>
+            <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="createTime">
+                <i-input v-model="mkActivitiesCombinationPrice.createTime" placeholder="创建时间"/>
+            </Form-item>
+            <Form-item label="创建人编号" prop="createrSn">
+                <i-input v-model="mkActivitiesCombinationPrice.createrSn" placeholder="创建人编号"/>
+            </Form-item>
+            <Form-item label="修改人编号" prop="moderSn">
+                <i-input v-model="mkActivitiesCombinationPrice.moderSn" placeholder="修改人编号"/>
+            </Form-item>
+            <Form-item label="修改时间" prop="updateTime">
+                <i-input v-model="mkActivitiesCombinationPrice.updateTime" placeholder="修改时间"/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <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/shop/mkactivitiescombinationprice.js?_${date.systemTime}"></script>
+</body>
+</html>

kmall-admin/src/main/webapp/WEB-INF/page/mk/shop/mkactivitiesdiscount.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("mkactivitiesdiscount:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesdiscount:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesdiscount: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="mkActivitiesDiscount" :rules="ruleValidate" :label-width="80">
+            <Form-item label="产品中文名" prop="productName">
+                <i-input v-model="mkActivitiesDiscount.productName" placeholder="产品中文名"/>
+            </Form-item>
+            <Form-item label="活动价格" prop="activityPrice">
+                <i-input v-model="mkActivitiesDiscount.activityPrice" placeholder="活动价格"/>
+            </Form-item>
+            <Form-item label="门店编号" prop="shopSn">
+                <i-input v-model="mkActivitiesDiscount.shopSn" placeholder="门店编号"/>
+            </Form-item>
+            <Form-item label="商品编码" prop="goodsSn">
+                <i-input v-model="mkActivitiesDiscount.goodsSn" placeholder="商品编码"/>
+            </Form-item>
+            <Form-item label="条形码" prop="barcode">
+                <i-input v-model="mkActivitiesDiscount.barcode" placeholder="条形码"/>
+            </Form-item>
+            <Form-item label="商品品牌" prop="productBrand">
+                <i-input v-model="mkActivitiesDiscount.productBrand" placeholder="商品品牌"/>
+            </Form-item>
+            <Form-item label="商品系列" prop="productSeries">
+                <i-input v-model="mkActivitiesDiscount.productSeries" placeholder="商品系列"/>
+            </Form-item>
+            <Form-item label="折扣" prop="discount">
+                <i-input v-model="mkActivitiesDiscount.discount" placeholder="折扣"/>
+            </Form-item>
+            <Form-item label="营销活动编号" prop="mkaId">
+                <i-input v-model="mkActivitiesDiscount.mkaId" placeholder="营销活动编号"/>
+            </Form-item>
+            <Form-item label="创建时间" prop="createTime">
+                <i-input v-model="mkActivitiesDiscount.createTime" placeholder="创建时间"/>
+            </Form-item>
+            <Form-item label="创建人编号" prop="createrSn">
+                <i-input v-model="mkActivitiesDiscount.createrSn" placeholder="创建人编号"/>
+            </Form-item>
+            <Form-item label="修改人编号" prop="moderSn">
+                <i-input v-model="mkActivitiesDiscount.moderSn" placeholder="修改人编号"/>
+            </Form-item>
+            <Form-item label="修改时间" prop="updateTime">
+                <i-input v-model="mkActivitiesDiscount.updateTime" placeholder="修改时间"/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <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/shop/mkactivitiesdiscount.js?_${date.systemTime}"></script>
+</body>
+</html>

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

@@ -0,0 +1,84 @@
+<!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("mkactivitiesfullgift:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesfullgift:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesfullgift: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="mkActivitiesFullGift" :rules="ruleValidate" :label-width="80">
+            <Form-item label="产品中文名" prop="productName">
+                <i-input v-model="mkActivitiesFullGift.productName" placeholder="产品中文名"/>
+            </Form-item>
+            <Form-item label="门店编号" prop="shopSn">
+                <i-input v-model="mkActivitiesFullGift.shopSn" placeholder="门店编号"/>
+            </Form-item>
+            <Form-item label="商品编码" prop="goodsSn">
+                <i-input v-model="mkActivitiesFullGift.goodsSn" placeholder="商品编码"/>
+            </Form-item>
+            <Form-item label="条形码" prop="barcode">
+                <i-input v-model="mkActivitiesFullGift.barcode" placeholder="条形码"/>
+            </Form-item>
+            <Form-item label="商品品牌" prop="productBrand">
+                <i-input v-model="mkActivitiesFullGift.productBrand" placeholder="商品品牌"/>
+            </Form-item>
+            <Form-item label="商品系列" prop="productSeries">
+                <i-input v-model="mkActivitiesFullGift.productSeries" placeholder="商品系列"/>
+            </Form-item>
+            <Form-item label="满足条件金额" prop="qualifiedAmount">
+                <i-input v-model="mkActivitiesFullGift.qualifiedAmount" placeholder="满足条件金额"/>
+            </Form-item>
+            <Form-item label="赠品条码" prop="giftBarcode">
+                <i-input v-model="mkActivitiesFullGift.giftBarcode" placeholder="赠品条码"/>
+            </Form-item>
+            <Form-item label="创建时间" prop="createTime">
+                <i-input v-model="mkActivitiesFullGift.createTime" placeholder="创建时间"/>
+            </Form-item>
+            <Form-item label="创建人编号" prop="createrSn">
+                <i-input v-model="mkActivitiesFullGift.createrSn" placeholder="创建人编号"/>
+            </Form-item>
+            <Form-item label="修改人编号" prop="moderSn">
+                <i-input v-model="mkActivitiesFullGift.moderSn" placeholder="修改人编号"/>
+            </Form-item>
+            <Form-item label="修改时间" prop="updateTime">
+                <i-input v-model="mkActivitiesFullGift.updateTime" placeholder="修改时间"/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <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/shop/mkactivitiesfullgift.js?_${date.systemTime}"></script>
+</body>
+</html>

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

@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>商品编码为主要匹配/上传依据，商品条形码为辅助查看而已
+活动方式
+满减，满xxx元立减xx元（x</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("mkactivitiesfullreduction:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesfullreduction:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesfullreduction: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="mkActivitiesFullReduction" :rules="ruleValidate" :label-width="80">
+            <Form-item label="产品中文名" prop="productName">
+                <i-input v-model="mkActivitiesFullReduction.productName" placeholder="产品中文名"/>
+            </Form-item>
+            <Form-item label="门店编号" prop="shopSn">
+                <i-input v-model="mkActivitiesFullReduction.shopSn" placeholder="门店编号"/>
+            </Form-item>
+            <Form-item label="商品编码" prop="goodsSn">
+                <i-input v-model="mkActivitiesFullReduction.goodsSn" placeholder="商品编码"/>
+            </Form-item>
+            <Form-item label="条形码" prop="barcode">
+                <i-input v-model="mkActivitiesFullReduction.barcode" placeholder="条形码"/>
+            </Form-item>
+            <Form-item label="商品品牌" prop="productBrand">
+                <i-input v-model="mkActivitiesFullReduction.productBrand" placeholder="商品品牌"/>
+            </Form-item>
+            <Form-item label="商品系列" prop="productSeries">
+                <i-input v-model="mkActivitiesFullReduction.productSeries" placeholder="商品系列"/>
+            </Form-item>
+            <Form-item label="满足条件金额" prop="qualifiedAmount">
+                <i-input v-model="mkActivitiesFullReduction.qualifiedAmount" placeholder="满足条件金额"/>
+            </Form-item>
+            <Form-item label="减扣金额" prop="deductionAmount">
+                <i-input v-model="mkActivitiesFullReduction.deductionAmount" placeholder="减扣金额"/>
+            </Form-item>
+            <Form-item label="创建时间" prop="createTime">
+                <i-input v-model="mkActivitiesFullReduction.createTime" placeholder="创建时间"/>
+            </Form-item>
+            <Form-item label="创建人编号" prop="createrSn">
+                <i-input v-model="mkActivitiesFullReduction.createrSn" placeholder="创建人编号"/>
+            </Form-item>
+            <Form-item label="修改人编号" prop="moderSn">
+                <i-input v-model="mkActivitiesFullReduction.moderSn" placeholder="修改人编号"/>
+            </Form-item>
+            <Form-item label="修改时间" prop="updateTime">
+                <i-input v-model="mkActivitiesFullReduction.updateTime" placeholder="修改时间"/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <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/shop/mkactivitiesfullreduction.js?_${date.systemTime}"></script>
+</body>
+</html>

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

@@ -0,0 +1,96 @@
+<!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("mkactivitiesgetonefreegoods:save"))
+                <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesgetonefreegoods:update"))
+                <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
+                #end
+                #if($shiro.hasPermission("mkactivitiesgetonefreegoods: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="mkActivitiesGetOneFreeGoods" :rules="ruleValidate" :label-width="80">
+            <Form-item label="产品中文名" prop="productName">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.productName" placeholder="产品中文名"/>
+            </Form-item>
+            <Form-item label="每日最低价" prop="edlp">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.edlp" placeholder="每日最低价"/>
+            </Form-item>
+            <Form-item label="建议零售价" prop="suggestedRetailPrice">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.suggestedRetailPrice" placeholder="建议零售价"/>
+            </Form-item>
+            <Form-item label="活动价格" prop="activityPrice">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.activityPrice" placeholder="活动价格"/>
+            </Form-item>
+            <Form-item label="门店编号" prop="shopSn">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.shopSn" placeholder="门店编号"/>
+            </Form-item>
+            <Form-item label="商品编码" prop="goodsSn">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.goodsSn" placeholder="商品编码"/>
+            </Form-item>
+            <Form-item label="条形码" prop="barcode">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.barcode" placeholder="条形码"/>
+            </Form-item>
+            <Form-item label="商品品牌" prop="productBrand">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.productBrand" placeholder="商品品牌"/>
+            </Form-item>
+            <Form-item label="商品系列" prop="productSeries">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.productSeries" placeholder="商品系列"/>
+            </Form-item>
+            <Form-item label="赠品条码" prop="giftBarcode">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.giftBarcode" placeholder="赠品条码"/>
+            </Form-item>
+            <Form-item label="营销活动编号" prop="mkaId">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.mkaId" placeholder="营销活动编号"/>
+            </Form-item>
+            <Form-item label="创建时间" prop="createTime">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.createTime" placeholder="创建时间"/>
+            </Form-item>
+            <Form-item label="创建人编号" prop="createrSn">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.createrSn" placeholder="创建人编号"/>
+            </Form-item>
+            <Form-item label="修改人编号" prop="moderSn">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.moderSn" placeholder="修改人编号"/>
+            </Form-item>
+            <Form-item label="修改时间" prop="updateTime">
+                <i-input v-model="mkActivitiesGetOneFreeGoods.updateTime" placeholder="修改时间"/>
+            </Form-item>
+            <Form-item>
+                <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
+                <i-button type="warning" @click="reload" style="margin-left: 8px"/>返回</i-button>
+                <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/shop/mkactivitiesgetonefreegoods.js?_${date.systemTime}"></script>
+</body>
+</html>

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

@@ -0,0 +1,149 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkactivitiescombinationprice/list',
+        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: '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,
+		mkActivitiesCombinationPrice: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkActivitiesCombinationPrice = {};
+		},
+		update: function (event) {
+            let macpId = getSelectedRow();
+			if (macpId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(macpId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkActivitiesCombinationPrice.macpId == null ? "../mkactivitiescombinationprice/save" : "../mkactivitiescombinationprice/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkActivitiesCombinationPrice),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let macpIds = getSelectedRows();
+			if (macpIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkactivitiescombinationprice/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(macpIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(macpId){
+			$.get("../mkactivitiescombinationprice/info/"+macpId, function (r) {
+                vm.mkActivitiesCombinationPrice = r.mkActivitiesCombinationPrice;
+            });
+		},
+        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/mkactivitiesdiscount.js

@@ -0,0 +1,151 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkactivitiesdiscount/list',
+        datatype: "json",
+        colModel: [
+			{label: 'madId', name: 'madId', index: 'mad_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: 'discount', index: 'discount', width: 80},
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
+			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
+			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
+			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+		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,
+		mkActivitiesDiscount: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkActivitiesDiscount = {};
+		},
+		update: function (event) {
+            let madId = getSelectedRow();
+			if (madId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(madId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkActivitiesDiscount.madId == null ? "../mkactivitiesdiscount/save" : "../mkactivitiesdiscount/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkActivitiesDiscount),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let madIds = getSelectedRows();
+			if (madIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkactivitiesdiscount/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(madIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(madId){
+			$.get("../mkactivitiesdiscount/info/"+madId, function (r) {
+                vm.mkActivitiesDiscount = r.mkActivitiesDiscount;
+            });
+		},
+        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

@@ -0,0 +1,150 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkactivitiesfullgift/list',
+        datatype: "json",
+        colModel: [
+			{label: 'mafrId', name: 'mafrId', index: 'mafr_id', key: true, hidden: true},
+			{label: '产品中文名', name: 'productName', index: 'product_name', 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: 'qualifiedAmount', index: 'qualified_amount', width: 80},
+			{label: '赠品条码', name: 'giftBarcode', index: 'gift_barcode', 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,
+		mkActivitiesFullGift: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkActivitiesFullGift = {};
+		},
+		update: function (event) {
+            let mafrId = getSelectedRow();
+			if (mafrId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(mafrId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkActivitiesFullGift.mafrId == null ? "../mkactivitiesfullgift/save" : "../mkactivitiesfullgift/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkActivitiesFullGift),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let mafrIds = getSelectedRows();
+			if (mafrIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkactivitiesfullgift/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(mafrIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(mafrId){
+			$.get("../mkactivitiesfullgift/info/"+mafrId, function (r) {
+                vm.mkActivitiesFullGift = r.mkActivitiesFullGift;
+            });
+		},
+        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/mkactivitiesfullreduction.js

@@ -0,0 +1,150 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkactivitiesfullreduction/list',
+        datatype: "json",
+        colModel: [
+			{label: 'mafrId', name: 'mafrId', index: 'mafr_id', key: true, hidden: true},
+			{label: '产品中文名', name: 'productName', index: 'product_name', 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: 'qualifiedAmount', index: 'qualified_amount', width: 80},
+			{label: '减扣金额', name: 'deductionAmount', index: 'deduction_amount', 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,
+		mkActivitiesFullReduction: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkActivitiesFullReduction = {};
+		},
+		update: function (event) {
+            let mafrId = getSelectedRow();
+			if (mafrId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(mafrId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkActivitiesFullReduction.mafrId == null ? "../mkactivitiesfullreduction/save" : "../mkactivitiesfullreduction/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkActivitiesFullReduction),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let mafrIds = getSelectedRows();
+			if (mafrIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkactivitiesfullreduction/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(mafrIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(mafrId){
+			$.get("../mkactivitiesfullreduction/info/"+mafrId, function (r) {
+                vm.mkActivitiesFullReduction = r.mkActivitiesFullReduction;
+            });
+		},
+        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/mkactivitiesgetonefreegoods.js

@@ -0,0 +1,153 @@
+$(function () {
+    $("#jqGrid").jqGrid({
+        url: '../mkactivitiesgetonefreegoods/list',
+        datatype: "json",
+        colModel: [
+			{label: 'mkaFreeId', name: 'mkaFreeId', index: 'mka_free_id', key: true, hidden: true},
+			{label: '产品中文名', name: 'productName', index: 'product_name', width: 80},
+			{label: '每日最低价', name: 'edlp', index: 'edlp', width: 80},
+			{label: '建议零售价', name: 'suggestedRetailPrice', index: 'suggested_retail_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: 'giftBarcode', index: 'gift_barcode', width: 80},
+			{label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
+			{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
+			{label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
+			{label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
+			{label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
+		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,
+		mkActivitiesGetOneFreeGoods: {},
+		ruleValidate: {
+			name: [
+				{required: true, message: '名称不能为空', trigger: 'blur'}
+			]
+		},
+		q: {
+		    name: ''
+		}
+	},
+	methods: {
+		query: function () {
+			vm.reload();
+		},
+		add: function () {
+			vm.showList = false;
+			vm.title = "新增";
+			vm.mkActivitiesGetOneFreeGoods = {};
+		},
+		update: function (event) {
+            let mkaFreeId = getSelectedRow();
+			if (mkaFreeId == null) {
+				return;
+			}
+			vm.showList = false;
+            vm.title = "修改";
+
+            vm.getInfo(mkaFreeId)
+		},
+		saveOrUpdate: function (event) {
+            let url = vm.mkActivitiesGetOneFreeGoods.mkaFreeId == null ? "../mkactivitiesgetonefreegoods/save" : "../mkactivitiesgetonefreegoods/update";
+			$.ajax({
+				type: "POST",
+			    url: url,
+			    contentType: "application/json",
+			    data: JSON.stringify(vm.mkActivitiesGetOneFreeGoods),
+                success: function (r) {
+                    if (r.code === 0) {
+                        alert('操作成功', function (index) {
+                            vm.reload();
+                        });
+                    } else {
+                        alert(r.msg);
+                    }
+                }
+			});
+		},
+		del: function (event) {
+            let mkaFreeIds = getSelectedRows();
+			if (mkaFreeIds == null){
+				return;
+			}
+
+			confirm('确定要删除选中的记录？', function () {
+				$.ajax({
+					type: "POST",
+				    url: "../mkactivitiesgetonefreegoods/delete",
+				    contentType: "application/json",
+				    data: JSON.stringify(mkaFreeIds),
+				    success: function (r) {
+						if (r.code == 0) {
+							alert('操作成功', function (index) {
+								$("#jqGrid").trigger("reloadGrid");
+							});
+						} else {
+							alert(r.msg);
+						}
+					}
+				});
+			});
+		},
+		getInfo: function(mkaFreeId){
+			$.get("../mkactivitiesgetonefreegoods/info/"+mkaFreeId, function (r) {
+                vm.mkActivitiesGetOneFreeGoods = r.mkActivitiesGetOneFreeGoods;
+            });
+		},
+        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);
+        }
+	}
+});