watero优惠券

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/ResultMsg.java

@@ -12,6 +12,9 @@ public class ResultMsg implements java.io.Serializable{
 	 */
 	private static final long serialVersionUID = 8987614804726091566L;
 
+	public static final String SUCCESS = "SUCCESS";
+	public static final String ERROR = "ERROR";
+
 	private boolean status; // 状态
 	
 	private String ResultCode ; //状态码

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/Exchange.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  兑换表类
+ * @author
+ * @Date 2018-12-11
+ */
+public class Exchange  implements  Serializable{
+    private static final long serialVersionUID = 4161577323724581015L;
+    //
+    private Integer exchangeId;
+    //
+    private Integer couponId;
+    //创建时间
+    private Date exchangeCreateTime;
+    //修改时间'
+    private Date exchangeUpdateTime;
+
+    public Integer getExchangeId(){
+        return exchangeId;
+    }
+
+    public void setExchangeId(Integer  exchangeId){
+        this.exchangeId=exchangeId;
+    }
+
+    public Integer getCouponId(){
+        return couponId;
+    }
+
+    public void setCouponId(Integer  couponId){
+        this.couponId=couponId;
+    }
+
+    public Date getExchangeCreateTime(){
+        return exchangeCreateTime;
+    }
+
+    public void setExchangeCreateTime(Date  exchangeCreateTime){
+        this.exchangeCreateTime=exchangeCreateTime;
+    }
+
+    public Date getExchangeUpdateTime(){
+        return exchangeUpdateTime;
+    }
+
+    public void setExchangeUpdateTime(Date  exchangeUpdateTime){
+        this.exchangeUpdateTime=exchangeUpdateTime;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/ExchangeItem.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.coupon;
+
+
+import  java.io.Serializable;
+/**
+ *  兑换子表类
+ * @author
+ * @Date 2018-12-11
+ */
+public class ExchangeItem  implements  Serializable{
+    private static final long serialVersionUID = 5940933839681811215L;
+    //
+    private Integer exchangeItemId;
+    //兑换表id
+    private Integer exchangeId;
+    //颜色id
+    private Integer colorId;
+    //数量'
+    private Integer exchangeItemNum;
+
+    public Integer getExchangeItemId(){
+        return exchangeItemId;
+    }
+
+    public void setExchangeItemId(Integer  exchangeItemId){
+        this.exchangeItemId=exchangeItemId;
+    }
+
+    public Integer getExchangeId(){
+        return exchangeId;
+    }
+
+    public void setExchangeId(Integer  exchangeId){
+        this.exchangeId=exchangeId;
+    }
+
+    public Integer getColorId(){
+        return colorId;
+    }
+
+    public void setColorId(Integer  colorId){
+        this.colorId=colorId;
+    }
+
+    public Integer getExchangeItemNum(){
+        return exchangeItemNum;
+    }
+
+    public void setExchangeItemNum(Integer  exchangeItemNum){
+        this.exchangeItemNum=exchangeItemNum;
+    }
+}

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/thanksgiving/ThanksGiving.java

@@ -0,0 +1,72 @@
+package com.iamberry.wechat.core.entity.thanksgiving;
+
+import  java.util.Date;
+import  java.io.Serializable;
+/**
+ *  活动-领取优惠券类
+ * @author
+ * @Date 2018-12-11
+ */
+public class ThanksGiving  implements  Serializable{
+    private static final long serialVersionUID = 4870415709390973071L;
+    //
+    private Integer thanksGivingId;
+    //电话号码
+    private String thanksGivingPhone;
+    //领取状态 1:未领取 2:已领取
+    private Integer thanksGivingStatus;
+    //领取时间
+    private Date thanksGivingTime;
+    //领取人openid'
+    private String thanksGivingOpenId;
+    //领取的优惠券id'
+    private String couponItemId;
+
+    public Integer getThanksGivingId(){
+        return thanksGivingId;
+    }
+
+    public void setThanksGivingId(Integer  thanksGivingId){
+        this.thanksGivingId=thanksGivingId;
+    }
+
+    public String getThanksGivingPhone(){
+        return thanksGivingPhone;
+    }
+
+    public void setThanksGivingPhone(String  thanksGivingPhone){
+        this.thanksGivingPhone=thanksGivingPhone;
+    }
+
+    public Integer getThanksGivingStatus(){
+        return thanksGivingStatus;
+    }
+
+    public void setThanksGivingStatus(Integer  thanksGivingStatus){
+        this.thanksGivingStatus=thanksGivingStatus;
+    }
+
+    public Date getThanksGivingTime(){
+        return thanksGivingTime;
+    }
+
+    public void setThanksGivingTime(Date  thanksGivingTime){
+        this.thanksGivingTime=thanksGivingTime;
+    }
+
+    public String getThanksGivingOpenId(){
+        return thanksGivingOpenId;
+    }
+
+    public void setThanksGivingOpenId(String  thanksGivingOpenId){
+        this.thanksGivingOpenId=thanksGivingOpenId;
+    }
+
+    public String getCouponItemId() {
+        return couponItemId;
+    }
+
+    public void setCouponItemId(String couponItemId) {
+        this.couponItemId = couponItemId;
+    }
+}

watero-common-tool/src/main/java/com/iamberry/wechat/tools/NameUtils.java

@@ -101,5 +101,5 @@ public class NameUtils {
     /** 
      * 验证码类型为仅小写字母 
      */  
-    public static final int TYPE_LOWER_ONLY = 6;  
+    public static final int TYPE_LOWER_ONLY = 6;
 }

watero-common-tool/src/main/java/com/iamberry/wechat/tools/payUtil/RandomUtil.java

@@ -82,4 +82,15 @@ public class RandomUtil {
 		return sb.toString();
 	}
 
+	/**
+	 * 6为短信验证码
+	 * @return
+	 */
+	public static String getRandom(){
+		String randNum = new Random().nextInt(1000000)+"";
+		if(randNum.length()!=4){
+			return getRandom();
+		}
+		return randNum;
+	}
 }

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/ExchangeItemService.java

@@ -0,0 +1,37 @@
+package com.iamberry.wechat.face.coupon;
+
+import com.iamberry.wechat.core.entity.coupon.ExchangeItem;
+
+import java.util.List;
+
+/**
+ *  兑换子表接口
+ * @author
+ * @Date 2018-12-11
+ */
+public interface ExchangeItemService {
+    /**
+     * 获取集合
+     * @param  exchangeItem
+     * @return List
+     */
+    List<ExchangeItem> getExchangeItemList(ExchangeItem  exchangeItem);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  exchangeItem
+     */
+    ExchangeItem  getExchangeItemById(Integer  id);
+    /**
+     * 增加数据
+     * @param  exchangeItem
+     * @return Integer
+     */
+    Integer  save(ExchangeItem exchangeItem);
+    /**
+     * 修改数据
+     * @param  exchangeItem
+     * @return Integer
+     */
+    Integer  update(ExchangeItem  exchangeItem);
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/coupon/ExchangeService.java

@@ -0,0 +1,37 @@
+package com.iamberry.wechat.face.coupon;
+
+import com.iamberry.wechat.core.entity.coupon.Exchange;
+
+import java.util.List;
+
+/**
+ *  兑换表接口
+ * @author
+ * @Date 2018-12-11
+ */
+public interface ExchangeService {
+    /**
+     * 获取集合
+     * @param  exchange
+     * @return List
+     */
+    List<Exchange> getExchangeList(Exchange  exchange);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  exchange
+     */
+    Exchange getExchangeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  exchange
+     * @return Integer
+     */
+    Integer  save(Exchange  exchange);
+    /**
+     * 修改数据
+     * @param  exchange
+     * @return Integer
+     */
+    Integer  update(Exchange  exchange);
+}

watero-wechat-interface/src/main/java/com/iamberry/wechat/face/thanksgiving/ThanksGivingService.java

@@ -0,0 +1,43 @@
+package com.iamberry.wechat.face.thanksgiving;
+
+import com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving;
+
+import java.util.List;
+
+/**
+ *  活动-领取优惠券接口
+ * @author
+ * @Date 2018-12-11
+ */
+public interface ThanksGivingService {
+    /**
+     * 获取集合
+     * @param  thanksGiving
+     * @return List
+     */
+    List<ThanksGiving> getThanksGivingList(ThanksGiving thanksGiving);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  thanksGiving
+     */
+    ThanksGiving  getThanksGivingById(Integer  id);
+    /**
+     * 增加数据
+     * @param  thanksGiving
+     * @return Integer
+     */
+    Integer  save(ThanksGiving  thanksGiving);
+    /**
+     * 修改数据
+     * @param  thanksGiving
+     * @return Integer
+     */
+    Integer  update(ThanksGiving  thanksGiving);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/coupon/ExchangeItemServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.wechat.service.coupon;
+
+import com.iamberry.wechat.core.entity.coupon.ExchangeItem;
+import com.iamberry.wechat.face.coupon.ExchangeItemService;
+import com.iamberry.wechat.service.mapper.ExchangeItemMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  兑换子表接口
+ * @author
+ * @Date 2018-12-11
+ */
+@Service
+public class ExchangeItemServiceImpl  implements ExchangeItemService {
+    @Autowired
+    private ExchangeItemMapper exchangeItemMapper;
+    /**
+     * 获取集合
+     * @param  exchangeItem
+     * @return List
+     */
+    @Override
+    public List<ExchangeItem> getExchangeItemList(ExchangeItem  exchangeItem){
+        return  exchangeItemMapper.getExchangeItemList(exchangeItem);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  exchangeItem
+     */
+    @Override
+    public  ExchangeItem  getExchangeItemById(Integer  id){
+        return  exchangeItemMapper.getExchangeItemById(id);
+    }
+    /**
+     * 增加数据
+     * @param  exchangeItem
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ExchangeItem  exchangeItem){
+        return  exchangeItemMapper.save(exchangeItem);
+    }
+    /**
+     * 修改数据
+     * @param  exchangeItem
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ExchangeItem  exchangeItem){
+        return  exchangeItemMapper.update(exchangeItem);
+    }
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/coupon/ExchangeServiceImpl.java

@@ -0,0 +1,56 @@
+package com.iamberry.wechat.service.coupon;
+
+import com.iamberry.wechat.core.entity.coupon.Exchange;
+import com.iamberry.wechat.face.coupon.ExchangeService;
+import com.iamberry.wechat.service.mapper.ExchangeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  兑换表接口
+ * @author
+ * @Date 2018-12-11
+ */
+@Service
+public class ExchangeServiceImpl  implements ExchangeService {
+    @Autowired
+    private ExchangeMapper exchangeMapper;
+    /**
+     * 获取集合
+     * @param  exchange
+     * @return List
+     */
+    @Override
+    public List<Exchange> getExchangeList(Exchange  exchange){
+        return  exchangeMapper.getExchangeList(exchange);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  exchange
+     */
+    @Override
+    public  Exchange  getExchangeById(Integer  id){
+        return  exchangeMapper.getExchangeById(id);
+    }
+    /**
+     * 增加数据
+     * @param  exchange
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(Exchange exchange){
+        return  exchangeMapper.save(exchange);
+    }
+    /**
+     * 修改数据
+     * @param  exchange
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(Exchange  exchange){
+        return  exchangeMapper.update(exchange);
+    }
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ExchangeItemMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.coupon.ExchangeItem;
+
+import java.util.List;
+
+/**
+ *  兑换子表接口
+ * @author
+ * @Date 2018-12-11
+ */
+public interface ExchangeItemMapper {
+    /**
+     * 获取集合
+     * @param  exchangeItem
+     * @return List
+     */
+    List<ExchangeItem> getExchangeItemList(ExchangeItem  exchangeItem);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  exchangeItem
+     */
+    ExchangeItem getExchangeItemById(Integer  id);
+    /**
+     * 增加数据
+     * @param  exchangeItem
+     * @return Integer
+     */
+    Integer  save(ExchangeItem  exchangeItem);
+    /**
+     * 修改数据
+     * @param  exchangeItem
+     * @return Integer
+     */
+    Integer  update(ExchangeItem  exchangeItem);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ExchangeMapper.java

@@ -0,0 +1,37 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.coupon.Exchange;
+
+import java.util.List;
+
+/**
+ *  兑换表接口
+ * @author
+ * @Date 2018-12-11
+ */
+public interface ExchangeMapper {
+    /**
+     * 获取集合
+     * @param  exchange
+     * @return List
+     */
+    List<Exchange> getExchangeList(Exchange  exchange);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  exchange
+     */
+    Exchange getExchangeById(Integer  id);
+    /**
+     * 增加数据
+     * @param  exchange
+     * @return Integer
+     */
+    Integer  save(Exchange  exchange);
+    /**
+     * 修改数据
+     * @param  exchange
+     * @return Integer
+     */
+    Integer  update(Exchange  exchange);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ThanksGivingMapper.java

@@ -0,0 +1,43 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving;
+
+import java.util.List;
+
+/**
+ *  活动-领取优惠券接口
+ * @author
+ * @Date 2018-12-11
+ */
+public interface ThanksGivingMapper {
+    /**
+     * 获取集合
+     * @param  thanksGiving
+     * @return List
+     */
+    List<ThanksGiving> getThanksGivingList(ThanksGiving  thanksGiving);
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  thanksGiving
+     */
+    ThanksGiving  getThanksGivingById(Integer  id);
+    /**
+     * 增加数据
+     * @param  thanksGiving
+     * @return Integer
+     */
+    Integer  save(ThanksGiving  thanksGiving);
+    /**
+     * 修改数据
+     * @param  thanksGiving
+     * @return Integer
+     */
+    Integer  update(ThanksGiving  thanksGiving);
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    Integer  delete(Integer  id);
+}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/exchangeItemMapper.xml

@@ -0,0 +1,69 @@
+<?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.iamberry.wechat.service.mapper.ExchangeItemMapper">
+    <resultMap  id="BaseResultMap" type="ExchangeItem" >
+        <result    column="exchange_item_id"    property="exchangeItemId" />
+        <result    column="exchange_id"    property="exchangeId" />
+        <result    column="color_id"    property="colorId" />
+        <result    column="exchange_item_num"    property="exchangeItemNum" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.exchange_item_id,
+        t.exchange_id,
+        t.color_id,
+        t.exchange_item_num
+    </sql>
+    <select id="getExchangeItemList" resultMap="BaseResultMap" parameterType="ExchangeItem" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_coupon_exchange_item t
+        <where>
+            <if test="exchangeItemId != null ">
+                AND t.exchange_item_id = #{exchangeItemId}
+            </if >
+            <if test="exchangeId != null ">
+                AND t.exchange_id = #{exchangeId}
+            </if >
+            <if test="colorId != null ">
+                AND t.color_id = #{colorId}
+            </if >
+        </where>
+    </select>
+    <select id="getExchangeItemById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_coupon_exchange_item t
+        where t.exchange_item_id= #{exchangeItemId}
+    </select>
+    <insert id="save" parameterType="ExchangeItem" >
+        insert into
+        tb_iamberry_coupon_exchange_item
+        (
+        exchange_id,
+        color_id,
+        exchange_item_num
+        )
+        values
+        (
+        #{exchangeId},
+        #{colorId},
+        #{exchangeItemNum}
+        )
+    </insert>
+    <update id="update" parameterType="ExchangeItem" >
+        update
+        tb_iamberry_coupon_exchange_item
+        <set >
+            <if test="exchangeId != null ">
+                exchange_id = #{exchangeId},
+            </if >
+            <if test="colorId != null ">
+                color_id = #{colorId},
+            </if >
+            <if test="exchangeItemNum != null ">
+                exchange_item_num = #{exchangeItemNum}
+            </if >
+        </set >
+        where exchange_item_id= #{exchangeItemId}
+    </update>
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/exchangeMapper.xml

@@ -0,0 +1,56 @@
+<?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.iamberry.wechat.service.mapper.ExchangeMapper">
+    <resultMap  id="BaseResultMap" type="Exchange" >
+        <result    column="exchange_id"    property="exchangeId" />
+        <result    column="coupon_id"    property="couponId" />
+        <result    column="exchange_create_time"    property="exchangeCreateTime" />
+        <result    column="exchange_update_time"    property="exchangeUpdateTime" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.exchange_id,
+        t.coupon_id,
+        t.exchange_create_time,
+        t.exchange_update_time
+    </sql>
+    <select id="getExchangeList" resultMap="BaseResultMap" parameterType="Exchange" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_coupon_exchange t
+        <where>
+            <if test="exchangeId != null ">
+                AND t.exchange_id = #{exchangeId}
+            </if >
+            <if test="couponId != null ">
+                AND t.coupon_id = #{couponId}
+            </if >
+        </where>
+    </select>
+    <select id="getExchangeById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_coupon_exchange t
+        where t.exchange_id= #{exchangeId}
+    </select>
+    <insert id="save" parameterType="Exchange" >
+        insert into
+        tb_iamberry_coupon_exchange
+        (
+        coupon_id
+        )
+        values
+        (
+        #{couponId}
+        )
+    </insert>
+    <update id="update" parameterType="Exchange" >
+        update
+        tb_iamberry_coupon_exchange
+        <set >
+            <if test="couponId != null ">
+                coupon_id = #{couponId},
+            </if >
+        </set >
+        where exchange_id= #{exchangeId}
+    </update>
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/thanksGivingMapper.xml

@@ -0,0 +1,89 @@
+<?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.iamberry.wechat.service.mapper.ThanksGivingMapper">
+    <resultMap  id="BaseResultMap" type="ThanksGiving" >
+        <result    column="thanks_giving_id"    property="thanksGivingId" />
+        <result    column="thanks_giving_phone"    property="thanksGivingPhone" />
+        <result    column="thanks_giving_status"    property="thanksGivingStatus" />
+        <result    column="thanks_giving_time"    property="thanksGivingTime" />
+        <result    column="thanks_giving_open_id"    property="thanksGivingOpenId" />
+        <result    column="coupon_item_id"    property="couponItemId" />
+    </resultMap>
+    <sql    id="Base_List" >
+        t.thanks_giving_id,
+        t.thanks_giving_phone,
+        t.thanks_giving_status,
+        t.thanks_giving_time,
+        t.thanks_giving_open_id,
+        t.coupon_item_id
+    </sql>
+    <select id="getThanksGivingList" resultMap="BaseResultMap" parameterType="ThanksGiving" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_thanks_giving t
+        <where>
+            <if test="thanksGivingId != null ">
+                AND t.thanks_giving_id = #{thanksGivingId}
+            </if >
+            <if test="thanksGivingPhone != null and thanksGivingPhone != ''">
+                AND t.thanks_giving_phone = #{thanksGivingPhone}
+            </if >
+            <if test="thanksGivingStatus != null ">
+                AND t.thanks_giving_status = #{thanksGivingStatus}
+            </if >
+            <if test="thanksGivingOpenId != null and thanksGivingOpenId != ''">
+                AND t.thanks_giving_open_id = #{thanksGivingOpenId}
+            </if >
+            <if test="couponItemId != null and couponItemId != ''">
+                AND t.coupon_item_id = #{couponItemId}
+            </if >
+        </where>
+    </select>
+    <select id="getThanksGivingById" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_iamberry_thanks_giving t
+        where t.thanks_giving_id= #{thanksGivingId}
+    </select>
+    <insert id="save" parameterType="ThanksGiving" >
+        insert into
+        tb_iamberry_thanks_giving
+        (
+        thanks_giving_phone,
+        thanks_giving_status,
+        thanks_giving_time,
+        thanks_giving_open_id,
+        coupon_item_id
+        )
+        values
+        (
+        #{thanksGivingPhone},
+        #{thanksGivingStatus},
+        #{thanksGivingTime},
+        #{thanksGivingOpenId},
+        #{couponItemId}
+        )
+    </insert>
+    <update id="update" parameterType="ThanksGiving" >
+        update
+        tb_iamberry_thanks_giving
+        <set >
+            <if test="thanksGivingPhone != null and thanksGivingPhone != ''">
+                thanks_giving_phone = #{thanksGivingPhone},
+            </if >
+            <if test="thanksGivingStatus != null ">
+                thanks_giving_status = #{thanksGivingStatus},
+            </if >
+            <if test="thanksGivingTime != null and thanksGivingTime != ''">
+                thanks_giving_time = #{thanksGivingTime},
+            </if >
+            <if test="thanksGivingOpenId != null and thanksGivingOpenId != ''">
+                thanks_giving_open_id = #{thanksGivingOpenId},
+            </if >
+            <if test="couponItemId != null and couponItemId != ''">
+                coupon_item_id = #{couponItemId}
+            </if >
+        </set >
+        where thanks_giving_id= #{thanksGivingId}
+    </update>
+</mapper>

watero-wechat-service/src/main/java/com/iamberry/wechat/service/thanksgiving/ThanksGivingServiceImpl.java

@@ -0,0 +1,99 @@
+package com.iamberry.wechat.service.thanksgiving;
+
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
+import com.iamberry.wechat.core.entity.coupon.CouponType;
+import com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving;
+import com.iamberry.wechat.face.thanksgiving.ThanksGivingService;
+import com.iamberry.wechat.service.mapper.CouponItemMapper;
+import com.iamberry.wechat.service.mapper.CouponTypeMapper;
+import com.iamberry.wechat.service.mapper.ThanksGivingMapper;
+import com.iamberry.wechat.tools.StrUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ *  活动-领取优惠券接口
+ * @author
+ * @Date 2018-12-11
+ */
+@Service
+public class ThanksGivingServiceImpl  implements ThanksGivingService {
+    @Autowired
+    private ThanksGivingMapper thanksGivingMapper;
+    @Autowired
+    private CouponItemMapper couponItemMapper;
+    @Autowired
+    private CouponTypeMapper couponTypeMapper;
+    /**
+     * 获取集合
+     * @param  thanksGiving
+     * @return List
+     */
+    @Override
+    public List<ThanksGiving> getThanksGivingList(ThanksGiving  thanksGiving){
+        return  thanksGivingMapper.getThanksGivingList(thanksGiving);
+    }
+    /**
+     * 查询单条数据
+     * @param  id
+     * @return  thanksGiving
+     */
+    @Override
+    public  ThanksGiving  getThanksGivingById(Integer  id){
+        return  thanksGivingMapper.getThanksGivingById(id);
+    }
+    /**
+     * 增加数据
+     * @param  thanksGiving
+     * @return Integer
+     */
+    @Override
+    public  Integer  save(ThanksGiving  thanksGiving){
+        return  thanksGivingMapper.save(thanksGiving);
+    }
+    /**
+     * 修改数据
+     * @param  thanksGiving
+     * @return Integer
+     */
+    @Override
+    public  Integer  update(ThanksGiving  thanksGiving){
+
+        CouponType couponType = couponTypeMapper.getCouponTypeById(1000);
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, 90);    //增加一天
+
+        //创建优惠券
+        CouponItem couponItem = new CouponItem();
+        String uuidStr = StrUtils.getUUID();
+        couponItem.setCouponItemId(uuidStr);
+        couponItem.setCouponId(couponType.getCouponId());
+        couponItem.setCouponReceiveDate(new Date());
+        couponItem.setCouponUseEndDate(calendar.getTime());
+        couponItem.setCouponUseStatus(1);
+        couponItem.setCouponItemRemark(couponType.getCouponRemark());
+        Integer flag = couponItemMapper.insertCouponItem(couponItem);
+
+
+        thanksGiving.setThanksGivingStatus(2);
+        thanksGiving.setThanksGivingTime(new Date());
+        flag = thanksGivingMapper.update(thanksGiving);
+
+        return  flag;
+    }
+
+    /**
+     * 删除数据
+     * @param  id
+     * @return Integer
+     */
+    @Override
+    public  Integer  delete(Integer  id){
+        return  thanksGivingMapper.delete(id);
+    }
+}

watero-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -45,6 +45,8 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.coupon.CouponItemDto" alias="CouponItemDto"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.coupon.AdminCouponItemDto" alias="AdminCouponItemDto"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.coupon.CouponType" alias="CouponType"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.coupon.Exchange" alias="Exchange"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.coupon.ExchangeItem" alias="ExchangeItem"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.drp.EarningLogs" alias="EarningLogs"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.drp.EasyPage" alias="EasyPage"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.drp.IncomeRecord" alias="IncomeRecord"/>
@@ -217,6 +219,10 @@
 		
 		<!-- 水机租赁 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.rent.RentTypeInfo" alias="RentTypeInfo"/>
+
+		<!--感恩回馈-活动-->
+		<typeAlias type="com.iamberry.wechat.core.entity.thanksgiving.ThanksGiving" alias="ThanksGiving"/>
+
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
 	<mappers>
@@ -235,6 +241,8 @@
 		<mapper resource="com/iamberry/wechat/service/mapper/configMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/couponItemMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/couponTypeMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/exchangeItemMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/exchangeMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/dealerRelationMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/drpRoleInfoMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/firstAccessMapper.xml"/>
@@ -298,5 +306,9 @@
 		<mapper resource="com/iamberry/rent/service/rebate/mapper/orderRebateMapper.xml"/>	
 		<mapper resource="com/iamberry/rent/service/order/mapper/rentExchangeMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/reserveMapper.xml"/>
+
+		<!--感恩回馈-活动-->
+		<mapper resource="com/iamberry/wechat/service/mapper/thanksGivingMapper.xml"/>
+
 	</mappers>
 </configuration>