Merge branch 'master' of zyh/kmall-haikong into master

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

@@ -0,0 +1,106 @@
+package com.kmall.admin.controller.mk;
+
+import java.util.List;
+import java.util.Map;
+
+import com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity;
+import com.kmall.admin.service.mk.MkActivitiesPresentIntegralService;
+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.*;
+
+/**
+ * 营销活动-赠送积分Controller
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2022-04-14 10:20:48
+ */
+@Controller
+@RequestMapping("mkactivitiespresentintegral")
+public class MkActivitiesPresentIntegralController {
+    @Autowired
+    private MkActivitiesPresentIntegralService mkActivitiesPresentIntegralService;
+
+    /**
+     * 查看列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("mkactivitiespresentintegral:list")
+    @ResponseBody
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+
+        List<MkActivitiesPresentIntegralEntity> mkActivitiesPresentIntegralList = mkActivitiesPresentIntegralService.queryList(query);
+        int total = mkActivitiesPresentIntegralService.queryTotal(query);
+
+        PageUtils pageUtil = new PageUtils(mkActivitiesPresentIntegralList, total, query.getLimit(), query.getPage());
+
+        return R.ok().put("page", pageUtil);
+    }
+
+    /**
+     * 查看信息
+     */
+    @RequestMapping("/info/{mapId}")
+    @RequiresPermissions("mkactivitiespresentintegral:info")
+    @ResponseBody
+    public R info(@PathVariable("mapId") Long mapId) {
+        MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral = mkActivitiesPresentIntegralService.queryObject(mapId);
+
+        return R.ok().put("mkActivitiesPresentIntegral", mkActivitiesPresentIntegral);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    @RequiresPermissions("mkactivitiespresentintegral:save")
+    @ResponseBody
+    public R save(@RequestBody MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
+        mkActivitiesPresentIntegralService.save(mkActivitiesPresentIntegral);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("mkactivitiespresentintegral:update")
+    @ResponseBody
+    public R update(@RequestBody MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
+        mkActivitiesPresentIntegralService.update(mkActivitiesPresentIntegral);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    @RequiresPermissions("mkactivitiespresentintegral:delete")
+    @ResponseBody
+    public R delete(@RequestBody Long[]mapIds) {
+        mkActivitiesPresentIntegralService.deleteBatch(mapIds);
+
+        return R.ok();
+    }
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/queryAll")
+    @ResponseBody
+    public R queryAll(@RequestParam Map<String, Object> params) {
+
+        List<MkActivitiesPresentIntegralEntity> list = mkActivitiesPresentIntegralService.queryList(params);
+
+        return R.ok().put("list", list);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/dao/mk/MkActivitiesPresentIntegralDao.java

@@ -0,0 +1,15 @@
+package com.kmall.admin.dao.mk;
+
+import com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity;
+import com.kmall.manager.dao.BaseDao;
+
+/**
+ * 营销活动-赠送积分Dao
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2022-04-14 10:20:48
+ */
+public interface MkActivitiesPresentIntegralDao extends BaseDao<MkActivitiesPresentIntegralEntity> {
+
+}

kmall-admin/src/main/java/com/kmall/admin/entity/mk/MkActivitiesPresentIntegralEntity.java

@@ -0,0 +1,290 @@
+package com.kmall.admin.entity.mk;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 营销活动-赠送积分实体
+ * 表名 mk_activities_present_integral
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2022-04-14 10:20:48
+ */
+public class MkActivitiesPresentIntegralEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long mapId;
+    /**
+     * 产品中文名
+     */
+    private String productName;
+    /**
+     * 赠送方式- 1 ：固定值 2：倍率
+     */
+    private String activityGiveType;
+    /**
+     * 赠送数值
+     */
+    private Integer activityGiveNum;
+    /**
+     * 门店编号
+     */
+    private String shopSn;
+    /**
+     * 商品sku
+     */
+    private String sku;
+    /**
+     * 条形码
+     */
+    private String barcode;
+    /**
+     * 商品品牌
+     */
+    private String productBrand;
+    /**
+     * 商品系列
+     */
+    private String productSeries;
+    /**
+     * 营销活动编号
+     */
+    private Long mkaId;
+    /**
+     * 是否与积分抵扣互斥，0:不互斥 1:互斥
+     */
+    private String rejectScore;
+    /**
+     * 截止日期
+     */
+    private String deadline;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人编号
+     */
+    private String createrSn;
+    /**
+     * 修改人编号
+     */
+    private String moderSn;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    /**
+     * 设置：编号
+     */
+    public void setMapId(Long mapId) {
+        this.mapId = mapId;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getMapId() {
+        return mapId;
+    }
+    /**
+     * 设置：产品中文名
+     */
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    /**
+     * 获取：产品中文名
+     */
+    public String getProductName() {
+        return productName;
+    }
+    /**
+     * 设置：赠送方式- 1 ：固定值 2：倍率
+     */
+    public void setActivityGiveType(String activityGiveType) {
+        this.activityGiveType = activityGiveType;
+    }
+
+    /**
+     * 获取：赠送方式- 1 ：固定值 2：倍率
+     */
+    public String getActivityGiveType() {
+        return activityGiveType;
+    }
+    /**
+     * 设置：赠送数值
+     */
+    public void setActivityGiveNum(Integer activityGiveNum) {
+        this.activityGiveNum = activityGiveNum;
+    }
+
+    /**
+     * 获取：赠送数值
+     */
+    public Integer getActivityGiveNum() {
+        return activityGiveNum;
+    }
+    /**
+     * 设置：门店编号
+     */
+    public void setShopSn(String shopSn) {
+        this.shopSn = shopSn;
+    }
+
+    /**
+     * 获取：门店编号
+     */
+    public String getShopSn() {
+        return shopSn;
+    }
+    /**
+     * 设置：商品sku
+     */
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    /**
+     * 获取：商品sku
+     */
+    public String getSku() {
+        return sku;
+    }
+    /**
+     * 设置：条形码
+     */
+    public void setBarcode(String barcode) {
+        this.barcode = barcode;
+    }
+
+    /**
+     * 获取：条形码
+     */
+    public String getBarcode() {
+        return barcode;
+    }
+    /**
+     * 设置：商品品牌
+     */
+    public void setProductBrand(String productBrand) {
+        this.productBrand = productBrand;
+    }
+
+    /**
+     * 获取：商品品牌
+     */
+    public String getProductBrand() {
+        return productBrand;
+    }
+    /**
+     * 设置：商品系列
+     */
+    public void setProductSeries(String productSeries) {
+        this.productSeries = productSeries;
+    }
+
+    /**
+     * 获取：商品系列
+     */
+    public String getProductSeries() {
+        return productSeries;
+    }
+    /**
+     * 设置：营销活动编号
+     */
+    public void setMkaId(Long mkaId) {
+        this.mkaId = mkaId;
+    }
+
+    /**
+     * 获取：营销活动编号
+     */
+    public Long getMkaId() {
+        return mkaId;
+    }
+    /**
+     * 设置：是否与积分抵扣互斥，0:不互斥 1:互斥
+     */
+    public void setRejectScore(String rejectScore) {
+        this.rejectScore = rejectScore;
+    }
+
+    /**
+     * 获取：是否与积分抵扣互斥，0:不互斥 1:互斥
+     */
+    public String getRejectScore() {
+        return rejectScore;
+    }
+    /**
+     * 设置：截止日期
+     */
+    public void setDeadline(String deadline) {
+        this.deadline = deadline;
+    }
+
+    /**
+     * 获取：截止日期
+     */
+    public String getDeadline() {
+        return deadline;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：创建人编号
+     */
+    public void setCreaterSn(String createrSn) {
+        this.createrSn = createrSn;
+    }
+
+    /**
+     * 获取：创建人编号
+     */
+    public String getCreaterSn() {
+        return createrSn;
+    }
+    /**
+     * 设置：修改人编号
+     */
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    /**
+     * 获取：修改人编号
+     */
+    public String getModerSn() {
+        return moderSn;
+    }
+    /**
+     * 设置：修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.kmall.admin.service.impl.mk;
+
+import com.kmall.admin.dao.mk.MkActivitiesPresentIntegralDao;
+import com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity;
+import com.kmall.admin.service.mk.MkActivitiesPresentIntegralService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 营销活动-赠送积分Service实现类
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2022-04-14 10:20:48
+ */
+@Service("mkActivitiesPresentIntegralService")
+public class MkActivitiesPresentIntegralServiceImpl implements MkActivitiesPresentIntegralService {
+    @Autowired
+    private MkActivitiesPresentIntegralDao mkActivitiesPresentIntegralDao;
+
+    @Override
+    public MkActivitiesPresentIntegralEntity queryObject(Long mapId) {
+        return mkActivitiesPresentIntegralDao.queryObject(mapId);
+    }
+
+    @Override
+    public List<MkActivitiesPresentIntegralEntity> queryList(Map<String, Object> map) {
+        return mkActivitiesPresentIntegralDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return mkActivitiesPresentIntegralDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
+        return mkActivitiesPresentIntegralDao.save(mkActivitiesPresentIntegral);
+    }
+
+    @Override
+    public int update(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral) {
+        return mkActivitiesPresentIntegralDao.update(mkActivitiesPresentIntegral);
+    }
+
+    @Override
+    public int delete(Long mapId) {
+        return mkActivitiesPresentIntegralDao.delete(mapId);
+    }
+
+    @Override
+    public int deleteBatch(Long[]mapIds) {
+        return mkActivitiesPresentIntegralDao.deleteBatch(mapIds);
+    }
+}

kmall-admin/src/main/java/com/kmall/admin/service/mk/MkActivitiesPresentIntegralService.java

@@ -0,0 +1,72 @@
+package com.kmall.admin.service.mk;
+
+import com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 营销活动-赠送积分Service接口
+ *
+ * @author emato
+ * @email admin@qhdswl.com
+ * @date 2022-04-14 10:20:48
+ */
+public interface MkActivitiesPresentIntegralService {
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param mapId 主键
+     * @return 实体
+     */
+    MkActivitiesPresentIntegralEntity queryObject(Long mapId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<MkActivitiesPresentIntegralEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param mkActivitiesPresentIntegral 实体
+     * @return 保存条数
+     */
+    int save(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param mkActivitiesPresentIntegral 实体
+     * @return 更新条数
+     */
+    int update(MkActivitiesPresentIntegralEntity mkActivitiesPresentIntegral);
+
+    /**
+     * 根据主键删除
+     *
+     * @param mapId
+     * @return 删除条数
+     */
+    int delete(Long mapId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param mapIds
+     * @return 删除条数
+     */
+    int deleteBatch(Long[]mapIds);
+}

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivitiesPresentIntegralDao.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.mk.MkActivitiesPresentIntegralDao">
+
+    <resultMap type="com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity" id="mkActivitiesPresentIntegralMap">
+        <result property="mapId" column="map_id"/>
+        <result property="productName" column="product_name"/>
+        <result property="activityGiveType" column="activity_give_type"/>
+        <result property="activityGiveNum" column="activity_give_num"/>
+        <result property="shopSn" column="shop_sn"/>
+        <result property="sku" column="sku"/>
+        <result property="barcode" column="barcode"/>
+        <result property="productBrand" column="product_brand"/>
+        <result property="productSeries" column="product_series"/>
+        <result property="mkaId" column="mka_id"/>
+        <result property="rejectScore" column="reject_score"/>
+        <result property="deadline" column="deadline"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createrSn" column="creater_sn"/>
+        <result property="moderSn" column="moder_sn"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity">
+		select
+			`map_id`,
+			`product_name`,
+			`activity_give_type`,
+			`activity_give_num`,
+			`shop_sn`,
+			`sku`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`mka_id`,
+			`reject_score`,
+			`deadline`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`
+		from mk_activities_present_integral
+		where map_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity">
+		select
+    		`map_id`,
+    		`product_name`,
+    		`activity_give_type`,
+    		`activity_give_num`,
+    		`shop_sn`,
+    		`sku`,
+    		`barcode`,
+    		`product_brand`,
+    		`product_series`,
+    		`mka_id`,
+    		`reject_score`,
+    		`deadline`,
+    		`create_time`,
+    		`creater_sn`,
+    		`moder_sn`,
+    		`update_time`
+		from mk_activities_present_integral
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by map_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mk_activities_present_integral
+		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.mk.MkActivitiesPresentIntegralEntity" useGeneratedKeys="true" keyProperty="mapId">
+		insert into mk_activities_present_integral(
+			`product_name`,
+			`activity_give_type`,
+			`activity_give_num`,
+			`shop_sn`,
+			`sku`,
+			`barcode`,
+			`product_brand`,
+			`product_series`,
+			`mka_id`,
+			`reject_score`,
+			`deadline`,
+			`create_time`,
+			`creater_sn`,
+			`moder_sn`,
+			`update_time`)
+		values(
+			#{productName},
+			#{activityGiveType},
+			#{activityGiveNum},
+			#{shopSn},
+			#{sku},
+			#{barcode},
+			#{productBrand},
+			#{productSeries},
+			#{mkaId},
+			#{rejectScore},
+			#{deadline},
+			#{createTime},
+			#{createrSn},
+			#{moderSn},
+			#{updateTime})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.mk.MkActivitiesPresentIntegralEntity">
+		update mk_activities_present_integral 
+		<set>
+			<if test="productName != null">`product_name` = #{productName}, </if>
+			<if test="activityGiveType != null">`activity_give_type` = #{activityGiveType}, </if>
+			<if test="activityGiveNum != null">`activity_give_num` = #{activityGiveNum}, </if>
+			<if test="shopSn != null">`shop_sn` = #{shopSn}, </if>
+			<if test="sku != null">`sku` = #{sku}, </if>
+			<if test="barcode != null">`barcode` = #{barcode}, </if>
+			<if test="productBrand != null">`product_brand` = #{productBrand}, </if>
+			<if test="productSeries != null">`product_series` = #{productSeries}, </if>
+			<if test="mkaId != null">`mka_id` = #{mkaId}, </if>
+			<if test="rejectScore != null">`reject_score` = #{rejectScore}, </if>
+			<if test="deadline != null">`deadline` = #{deadline}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
+			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>
+			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+		</set>
+		where map_id = #{mapId}
+	</update>
+	
+	<delete id="delete">
+		delete from mk_activities_present_integral where map_id = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from mk_activities_present_integral where map_id in 
+		<foreach item="mapId" collection="array" open="(" separator="," close=")">
+			#{mapId}
+		</foreach>
+	</delete>
+
+</mapper>