Merge branch 'feat-zdw-1001921' into 'master'

feat-1001921: 群打卡增加自定义优惠券

See merge request rays/pcloud-book!237

pcloud-service-book/src/main/java/com/pcloud/book/util/common/YesOrNoEnums.java

+package com.pcloud.book.util.common;
+
+/**
+ * @Describe: 是否枚举类
+ * @Author: zhangdongwei
+ * @Date: Create on 20:08 2019/11/18 0018
+ */
+public enum  YesOrNoEnums {
+    /**
+     * 是
+     */
+    YES(1),
+    /**
+     * 否
+     */
+    NO(0);
+
+    private Integer value;
+
+    YesOrNoEnums(Integer value) {
+        this.value = value;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/biz/WeixinClockBiz.java

@@ -5,6 +5,7 @@ import com.pcloud.book.group.vo.ListGroupClassifyParam;
 import com.pcloud.book.weixinclock.dto.ListWeixinClockRankDto;
 import com.pcloud.book.weixinclock.dto.RankDto;
 import com.pcloud.book.weixinclock.dto.WeixinClockDto;
+import com.pcloud.book.weixinclock.vo.response.GetClockCouponResponseVO;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
@@ -108,4 +109,12 @@ public interface WeixinClockBiz {
      * 旧数据处理
      */
     void solveOldData();
+
+    /**
+     * 获取群打卡奖励优惠券
+     * @param wxGroupId
+     * @param wechatUserId
+     * @return
+     */
+    GetClockCouponResponseVO getClockCoupon(String wxGroupId, Long wechatUserId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/check/impl/WeixinClockCheckImpl.java

@@ -34,6 +34,12 @@ public class WeixinClockCheckImpl implements WeixinClockCheck {
         if(StringUtil.isEmpty(weixinClockDto.getClockIntroduction())){
             throw new BookBizException(BookBizException.ERROR,"缺少打卡简介！");
         }
+        if (weixinClockDto.getIsOpenCoupon() == 1 && null == weixinClockDto.getCoupon()){
+            throw  new BookBizException(BookBizException.ERROR, "未设置打卡奖励优惠券");
+        }
+        if (null != weixinClockDto.getCoupon() && weixinClockDto.getCoupon().getProOriginPrice().compareTo(weixinClockDto.getCoupon().getCouponPrice()) < 0){
+            throw new BookBizException(BookBizException.ERROR, "优惠券价格不能大于商品原价");
+        }
         /*if(null == weixinClockDto.getClockPrizeId()){
             throw new BookBizException(BookBizException.ERROR,"缺少打卡的奖励应用ID！");
         }*/

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/dao/WeixinClockCouponDao.java

+package com.pcloud.book.weixinclock.dao;
+
+import com.pcloud.book.weixinclock.entity.WeixinClockCoupon;
+import com.pcloud.common.core.dao.BaseDao;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Describe: 微信群打卡优惠券dao
+ * @Author: zhangdongwei
+ * @Date: Create on 11:18 2019/11/12 0012
+ */
+public interface WeixinClockCouponDao extends BaseDao<WeixinClockCoupon> {
+    /**
+     * 获取微信群打卡基本信息
+     * @param id
+     * @return
+     */
+    WeixinClockCoupon getBaseById(Long id);
+
+    /**
+     * 根据打卡id获取打卡奖励优惠券信息
+     * @param weixinClockId
+     * @return
+     */
+    WeixinClockCoupon getBaseByClockId(Long weixinClockId);
+
+    /**
+     * 根据打卡id列表获取打卡优惠券列表
+     * @param clockIds
+     * @return
+     */
+    Map<Long, WeixinClockCoupon> getByClockIds(List<Long> clockIds);
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/dao/WeixinClockDao.java

@@ -24,4 +24,10 @@ public interface WeixinClockDao extends BaseDao<WeixinClock> {
      * @param weixinClockId
      */
     WeixinClockDto getWeixinClockBaseInfo(Long weixinClockId);
+
+    /**
+     * 获取微信群的签到打卡信息
+     * @param
+     */
+    WeixinClockDto getByWxGroupId(String wxGroupId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/dao/WeixinClockUserCouponDao.java

+package com.pcloud.book.weixinclock.dao;
+
+import com.pcloud.book.weixinclock.entity.WeixinClockUserCoupon;
+import com.pcloud.common.core.dao.BaseDao;
+
+/**
+ * @Describe: 微信群打卡用户优惠dao
+ * @Author: zhangdongwei
+ * @Date: Create on 9:24 2019/11/19 0019
+ */
+public interface WeixinClockUserCouponDao extends BaseDao<WeixinClockUserCoupon> {
+    /**
+     * 获取我的优惠券
+     * @param wxGroupId
+     * @param wechatUserId
+     * @return
+     */
+    WeixinClockUserCoupon getByGroupAndUser(String wxGroupId, Long wechatUserId);
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/dao/impl/WeixinClockCouponDaoImpl.java

+package com.pcloud.book.weixinclock.dao.impl;
+
+import com.pcloud.book.weixinclock.dao.WeixinClockCouponDao;
+import com.pcloud.book.weixinclock.entity.WeixinClockCoupon;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Describe: 微信群打卡优惠券dao实现层
+ * @Author: zhangdongwei
+ * @Date: Create on 11:19 2019/11/12 0012
+ */
+@Repository("weixinClockCouponDao")
+public class WeixinClockCouponDaoImpl extends BaseDaoImpl<WeixinClockCoupon> implements WeixinClockCouponDao {
+    @Override
+    public WeixinClockCoupon getBaseById(Long id) {
+        return super.sqlSessionTemplate.selectOne(getStatement("getBaseById"), id);
+    }
+
+    @Override
+    public WeixinClockCoupon getBaseByClockId(Long weixinClockId) {
+        return super.sqlSessionTemplate.selectOne(getStatement("getBaseByClockId"), weixinClockId);
+    }
+
+    @Override
+    public Map<Long, WeixinClockCoupon> getByClockIds(List<Long> clockIds) {
+        return super.sqlSessionTemplate.selectMap(getStatement("getByClockIds"), clockIds, "weixinClockId");
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/dao/impl/WeixinClockDaoImpl.java

@@ -36,4 +36,9 @@ public class WeixinClockDaoImpl extends BaseDaoImpl<WeixinClock> implements Weix
     public WeixinClockDto getWeixinClockBaseInfo(Long weixinClockId) {
         return super.sqlSessionTemplate.selectOne(getStatement("getWeixinClockBaseInfo"),weixinClockId);
     }
+
+    @Override
+    public WeixinClockDto getByWxGroupId(String wxGroupId) {
+        return super.sqlSessionTemplate.selectOne(getStatement("getByWxGroupId"),wxGroupId);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/dao/impl/WeixinClockUserCouponDaoImpl.java

+package com.pcloud.book.weixinclock.dao.impl;
+
+import com.pcloud.book.weixinclock.dao.WeixinClockUserCouponDao;
+import com.pcloud.book.weixinclock.entity.WeixinClockUserCoupon;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Describe: 微信群打卡用户优惠dao实现类
+ * @Author: zhangdongwei
+ * @Date: Create on 9:25 2019/11/19 0019
+ */
+@Repository("weixinClockUserCouponDao")
+public class WeixinClockUserCouponDaoImpl extends BaseDaoImpl<WeixinClockUserCoupon> implements WeixinClockUserCouponDao {
+    @Override
+    public WeixinClockUserCoupon getByGroupAndUser(String wxGroupId, Long wechatUserId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("wxGroupId", wxGroupId);
+        map.put("wechatUserId", wechatUserId);
+        return super.sqlSessionTemplate.selectOne(getStatement("getByGroupAndUser"),map);
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/dto/WeixinClockDto.java

@@ -3,11 +3,14 @@ package com.pcloud.book.weixinclock.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.pcloud.book.group.vo.StatisticVO;
 import com.pcloud.book.weixinclock.entity.WeixinClockReward;
+import com.pcloud.book.weixinclock.vo.request.CouponRequestVO;
 import com.pcloud.common.dto.BaseDto;
 
 import java.util.Date;
 import java.util.List;
 
+import javax.validation.Valid;
+
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -52,6 +55,16 @@ public class WeixinClockDto extends BaseDto {
     @ApiModelProperty("打卡奖励URL")
     private String clockPrizeUrl;
 
+    @ApiModelProperty("是否开启优惠券")
+    private Integer isOpenCoupon;
+
+    @ApiModelProperty("是否开启打卡抽奖")
+    private Integer isOpenPrize;
+
+    @ApiModelProperty("打卡奖励优惠券信息")
+    @Valid
+    private CouponRequestVO coupon;
+
     @ApiModelProperty("创建人")
     private Long createUser;
 
@@ -154,6 +167,30 @@ public class WeixinClockDto extends BaseDto {
         this.clockPrizeUrl = clockPrizeUrl;
     }
 
+    public Integer getIsOpenCoupon() {
+        return isOpenCoupon;
+    }
+
+    public Integer getIsOpenPrize() {
+        return isOpenPrize;
+    }
+
+    public void setIsOpenPrize(Integer isOpenPrize) {
+        this.isOpenPrize = isOpenPrize;
+    }
+
+    public void setIsOpenCoupon(Integer isOpenCoupon) {
+        this.isOpenCoupon = isOpenCoupon;
+    }
+
+    public CouponRequestVO getCoupon() {
+        return coupon;
+    }
+
+    public void setCoupon(CouponRequestVO coupon) {
+        this.coupon = coupon;
+    }
+
     public Long getCreateUser() {
         return createUser;
     }
@@ -204,6 +241,7 @@ public class WeixinClockDto extends BaseDto {
                 ", clockIntroduction='" + clockIntroduction + '\'' +
                 ", clockPrizeId=" + clockPrizeId +
                 ", clockPrizeUrl='" + clockPrizeUrl + '\'' +
+                ", isOpenCoupon=" + isOpenCoupon +
                 ", createUser=" + createUser +
                 ", createDate=" + createDate +
                 ", lastModifiedUser=" + lastModifiedUser +

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/entity/WeixinClock.java

@@ -34,6 +34,12 @@ public class WeixinClock extends BaseEntity {
     @ApiModelProperty("打卡奖励URL")
     private String clockPrizeUrl;
 
+    @ApiModelProperty("是否开启优惠券奖励")
+    private Integer isOpenCoupon;
+
+    @ApiModelProperty("是否开启打卡抽奖")
+    private Integer isOpenPrize;
+
     @ApiModelProperty("创建人")
     private Long createUser;
 
@@ -96,6 +102,22 @@ public class WeixinClock extends BaseEntity {
         this.clockPrizeUrl = clockPrizeUrl;
     }
 
+    public Integer getIsOpenCoupon() {
+        return isOpenCoupon;
+    }
+
+    public void setIsOpenCoupon(Integer isOpenCoupon) {
+        this.isOpenCoupon = isOpenCoupon;
+    }
+
+    public Integer getIsOpenPrize() {
+        return isOpenPrize;
+    }
+
+    public void setIsOpenPrize(Integer isOpenPrize) {
+        this.isOpenPrize = isOpenPrize;
+    }
+
     public Long getCreateUser() {
         return createUser;
     }

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/entity/WeixinClockCoupon.java

+package com.pcloud.book.weixinclock.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pcloud.common.entity.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+
+/**
+ * @Describe: 群打卡优惠券entity
+ * @Author: zhangdongwei
+ * @Date: Create on 9:41 2019/11/11 0011
+ */
+@Data
+public class WeixinClockCoupon extends BaseEntity {
+
+    private Long weixinClockId;
+    /**
+     * 优惠券平台（淘宝、京东、当当）
+     */
+    private Integer couponPlatform;
+    /**
+     * 商品名称
+     */
+    private String title;
+    /**
+     * 商品图片
+     */
+    private String pictUrl;
+    /**
+     * 商品原始价格
+     */
+    private BigDecimal proOriginPrice;
+    /**
+     * 优惠券价格
+     */
+    private BigDecimal couponPrice;
+    /**
+     * 劵后价格
+     */
+    private BigDecimal afterCouponPrice;
+    /**
+     * 优惠券点击链接
+     */
+    private String couponClickUrl;
+
+    /**
+     * 领取优惠券的打卡天数
+     */
+    private Integer dayNum;
+
+    private Long createUser;
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date createTime;
+    private Long updateUser;
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date updateTime;
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/entity/WeixinClockUserCoupon.java

+package com.pcloud.book.weixinclock.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+
+import lombok.Data;
+
+/**
+ * @Describe: 群打卡用户优惠券
+ * @Author: zhangdongwei
+ * @Date: Create on 9:09 2019/11/19 0019
+ */
+@Data
+public class WeixinClockUserCoupon extends BaseEntity {
+    private Long weixinClockId;
+    private String wxUserId;
+    private Long wechatUserId;
+    private String wxGroupId;
+    private Long clockCouponId;
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/facade/WeixinClockFacade.java

@@ -129,4 +129,12 @@ public interface WeixinClockFacade {
     public ResponseDto<?> getShareMemberRank(@CookieValue("userInfo") String userInfo,
                                              @RequestParam(value = "wxGroupId") String wxGroupId,
                                              @RequestParam(value = "wxUserId") String wxUserId)throws BizException, PermissionException;
+
+
+    @ApiOperation("获取某个群内打卡优惠券")
+    @ApiImplicitParams({@ApiImplicitParam(name = "userInfo", value = "Cookie", dataType = "string", paramType = "header"),
+            @ApiImplicitParam(name = "wxGroupId", value = "微信群id", dataType = "string", paramType = "query")
+    })
+    @RequestMapping(value = "getClockCoupon", method = RequestMethod.GET)
+    ResponseDto<?> getClockCoupon(@CookieValue("userInfo")String userInfo,@RequestParam("wxGroupId") String wxGroupId)throws BizException, PermissionException;
 }

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/facade/impl/WeixinClockFacadeImpl.java

@@ -17,6 +17,7 @@ import com.pcloud.common.utils.cookie.Cookie;
 import com.pcloud.common.utils.nginx.NginxUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -55,7 +56,7 @@ public class WeixinClockFacadeImpl implements WeixinClockFacade {
     @Override
     @RequestMapping(value = "createWeixinClock", method = RequestMethod.POST)
     public ResponseDto<?> createWeixinClock(@RequestHeader("token") String token,
-                                            @RequestBody WeixinClockDto weixinClockDto) throws BizException, PermissionException {
+                                            @Validated @RequestBody WeixinClockDto weixinClockDto) throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         weixinClockDto.setCreateUser(adviserId);
         weixinClockDto.setLastModifiedUser(adviserId);
@@ -227,9 +228,16 @@ public class WeixinClockFacadeImpl implements WeixinClockFacade {
     }
 
     @RequestMapping(value = "solveOldData", method = RequestMethod.GET)
-    public ResponseDto<?> solveOldData(){
+    public ResponseDto<?> solveOldData() {
         weixinClockBiz.solveOldData();
         return new ResponseDto<>();
     }
 
+    @Override
+    @RequestMapping(value = "getClockCoupon", method = RequestMethod.GET)
+    public ResponseDto<?> getClockCoupon(@CookieValue("userInfo")String userInfo,@RequestParam("wxGroupId") String wxGroupId)throws BizException, PermissionException {
+        Long wechatUserId = Cookie.getId(userInfo, Cookie._WECHAT_USER_ID);
+        return new ResponseDto<>(weixinClockBiz.getClockCoupon(wxGroupId, wechatUserId));
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/vo/request/CouponRequestVO.java

+package com.pcloud.book.weixinclock.vo.request;
+
+import com.pcloud.book.weixinclock.entity.WeixinClockCoupon;
+import com.pcloud.common.entity.BaseRequestVO;
+import com.pcloud.common.utils.bean.BeanUtils;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Data;
+
+/**
+ * @Describe: 优惠券请求vo
+ * @Author: zhangdongwei
+ * @Date: Create on 16:07 2019/11/12 0012
+ */
+@Data
+public class CouponRequestVO extends BaseRequestVO {
+    /**
+     * 优惠券平台（淘宝、京东、当当）
+     */
+    @NotNull(message = "未选择优惠券平台")
+    private Integer couponPlatform;
+    /**
+     * 商品名称
+     */
+    @NotNull(message = "未填写商品名称")
+    private String title;
+    /**
+     * 商品图片
+     */
+    @NotNull(message = "没有商品图片")
+    private String pictUrl;
+    /**
+     * 商品原始价格
+     */
+    @NotNull(message = "未填写商品原始价格")
+    private BigDecimal proOriginPrice;
+    /**
+     * 优惠券价格
+     */
+    @NotNull(message = "未填写优惠券金额")
+    private BigDecimal couponPrice;
+    /**
+     * 优惠券点击链接
+     */
+    @NotNull(message = "优惠券链接不能为空")
+    private String couponClickUrl;
+    /**
+     * 领取优惠券天数
+     */
+    @NotNull(message = "未设置领取的打卡天数")
+    private Integer dayNum;
+
+    public static WeixinClockCoupon valueToEntity(CouponRequestVO vo){
+        WeixinClockCoupon weixinClockCoupon = BeanUtils.copy(vo, WeixinClockCoupon.class);
+        weixinClockCoupon.setAfterCouponPrice(vo.getProOriginPrice().subtract(vo.getCouponPrice()));
+        weixinClockCoupon.setCreateUser(vo.getUserId());
+        weixinClockCoupon.setUpdateUser(vo.getUserId());
+        Date now = new Date();
+        weixinClockCoupon.setCreateTime(now);
+        weixinClockCoupon.setUpdateTime(now);
+        return weixinClockCoupon;
+    }
+
+    public static CouponRequestVO valueOfEntity(WeixinClockCoupon weixinClockCoupon){
+        CouponRequestVO vo = BeanUtils.copy(weixinClockCoupon, CouponRequestVO.class);
+        return vo;
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/weixinclock/vo/response/GetClockCouponResponseVO.java

+package com.pcloud.book.weixinclock.vo.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pcloud.book.weixinclock.entity.WeixinClockCoupon;
+import com.pcloud.common.utils.bean.BeanUtils;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+
+/**
+ * @Describe: 获取群打卡奖励优惠券返回类
+ * @Author: zhangdongwei
+ * @Date: Create on 20:33 2019/11/18 0018
+ */
+@Data
+public class GetClockCouponResponseVO {
+    /**
+     * 优惠券平台（淘宝、京东、当当）
+     */
+    private Integer couponPlatform;
+    /**
+     * 商品名称
+     */
+    private String title;
+    /**
+     * 商品图片
+     */
+    private String pictUrl;
+    /**
+     * 商品原始价格
+     */
+    private BigDecimal proOriginPrice;
+    /**
+     * 优惠券价格
+     */
+    private BigDecimal couponPrice;
+    /**
+     * 劵后价格
+     */
+    private BigDecimal afterCouponPrice;
+    /**
+     * 优惠券点击链接
+     */
+    private String couponClickUrl;
+    /**
+     * 领取优惠券天数
+     */
+    private Integer dayNum;
+
+    /**
+     * 领取时间
+     */
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss",
+            timezone = "GMT+8"
+    )
+    private Date getTime;
+
+    /**
+     * 是否有优惠券
+     */
+    private Integer hasCoupon;
+
+    /**
+     * 是否获得优惠券
+     */
+    private Integer hasGot;
+
+    public static GetClockCouponResponseVO valueFromEntity(WeixinClockCoupon weixinClockCoupon){
+        GetClockCouponResponseVO vo = BeanUtils.copy(weixinClockCoupon, GetClockCouponResponseVO.class);
+        return vo;
+    }
+}

pcloud-service-book/src/main/resources/mapper/weixinclock/WeixinClock.Mapper.xml

@@ -9,6 +9,8 @@
         <result column="clock_introduction" property="clockIntroduction" jdbcType="VARCHAR"/>
         <result column="clock_prize_id" property="clockPrizeId" jdbcType="BIGINT"/>
         <result column="clock_prize_url" property="clockPrizeUrl" jdbcType="VARCHAR"/>
+        <result column="is_open_coupon" property="isOpenCoupon" jdbcType="INTEGER"/>
+        <result column="is_open_prize" property="isOpenPrize" jdbcType="INTEGER"/>
         <result column="create_user" property="createUser" jdbcType="BIGINT"/>
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP"/>
         <result column="last_modified_user" property="lastModifiedUser" jdbcType="BIGINT"/>
@@ -22,6 +24,8 @@
         <result column="clock_introduction" property="clockIntroduction" jdbcType="VARCHAR"/>
         <result column="clock_prize_id" property="clockPrizeId" jdbcType="BIGINT"/>
         <result column="clock_prize_url" property="clockPrizeUrl" jdbcType="VARCHAR"/>
+        <result column="is_open_coupon" property="isOpenCoupon" jdbcType="INTEGER"/>
+        <result column="is_open_prize" property="isOpenPrize" jdbcType="INTEGER"/>
         <result column="create_user" property="createUser" jdbcType="BIGINT"/>
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP"/>
         <result column="last_modified_user" property="lastModifiedUser" jdbcType="BIGINT"/>
@@ -37,6 +41,8 @@
         <result column="clock_introduction" property="clockIntroduction" jdbcType="VARCHAR"/>
         <result column="clock_prize_id" property="clockPrizeId" jdbcType="BIGINT"/>
         <result column="clock_prize_url" property="clockPrizeUrl" jdbcType="VARCHAR"/>
+        <result column="is_open_coupon" property="isOpenCoupon" jdbcType="INTEGER"/>
+        <result column="is_open_prize" property="isOpenPrize" jdbcType="INTEGER"/>
         <result column="create_user" property="createUser" jdbcType="BIGINT"/>
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP"/>
         <result column="last_modified_user" property="lastModifiedUser" jdbcType="BIGINT"/>
@@ -50,18 +56,18 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        weixin_clock_id, clock_keyword, clock_guide, clock_introduction, clock_prize_id, clock_prize_url, create_user, create_date,
+        weixin_clock_id, clock_keyword, clock_guide, clock_introduction, clock_prize_id, clock_prize_url, is_open_coupon, is_open_prize, create_user, create_date,
         last_modified_user, last_modified_date
     </sql>
 
     <insert id="insert" parameterType="weixinClock" useGeneratedKeys="true" keyProperty="weixinClockId" flushCache="true">
         INSERT INTO weixin_clock (
-        clock_keyword, clock_guide, clock_introduction, clock_prize_id, clock_prize_url, create_user, create_date,
+        clock_keyword, clock_guide, clock_introduction, clock_prize_id, clock_prize_url, is_open_coupon, is_open_prize, create_user, create_date,
         last_modified_user, last_modified_date
         )
         VALUES (
         #{clockKeyword, jdbcType=VARCHAR}, #{clockGuide, jdbcType=VARCHAR}, #{clockIntroduction, jdbcType=VARCHAR}, #{clockPrizeId, jdbcType=BIGINT},
-        #{clockPrizeUrl, jdbcType=VARCHAR}, #{createUser, jdbcType=VARCHAR}, NOW(), #{lastModifiedUser, jdbcType=BIGINT}, NOW()
+        #{clockPrizeUrl, jdbcType=VARCHAR}, #{isOpenCoupon}, #{isOpenPrize}, #{createUser, jdbcType=VARCHAR}, NOW(), #{lastModifiedUser, jdbcType=BIGINT}, NOW()
         )
     </insert>
 
@@ -92,6 +98,12 @@
             <if test="clockPrizeUrl != null">
                 clock_prize_url = #{clockPrizeUrl, jdbcType=VARCHAR},
             </if>
+            <if test="isOpenCoupon != null">
+                is_open_coupon = #{isOpenCoupon},
+            </if>
+            <if test="isOpenPrize != null">
+                is_open_prize = #{isOpenPrize},
+            </if>
             <if test="lastModifiedUser != null">
                 last_modified_user = #{lastModifiedUser, jdbcType=BIGINT},
             </if>
@@ -107,7 +119,7 @@
     </delete>
 
     <select id="listWeixinClock4Adviser" parameterType="map" resultMap="BaseResultListMapDTO">
-        SELECT  weixin_clock_id, clock_keyword, clock_guide, clock_introduction,
+        SELECT  weixin_clock_id, clock_keyword, clock_guide, clock_introduction, is_open_coupon, is_open_prize,
         clock_prize_id, clock_prize_url, create_user, create_date, last_modified_user, last_modified_date
         FROM
         weixin_clock
@@ -119,7 +131,7 @@
     </select>
 
     <select id="getWeixinClockBaseInfo" parameterType="Long" resultMap="ClockBaseInfoMap">
-        SELECT  weixin_clock_id, clock_keyword, clock_guide, clock_introduction,
+        SELECT  weixin_clock_id, clock_keyword, clock_guide, clock_introduction, is_open_coupon, is_open_prize,
         clock_prize_id, clock_prize_url, create_user, create_date, last_modified_user, last_modified_date
         FROM
         weixin_clock
@@ -147,4 +159,14 @@
         order by c.id desc, g.id desc
     </select>
 
+    <select id="getByWxGroupId" resultMap="ClockBaseInfoMap" parameterType="string">
+        select cl.weixin_clock_id, cl.clock_keyword, cl.clock_guide, cl.clock_introduction, cl.clock_prize_id, cl.clock_prize_url, cl.is_open_coupon, cl.is_open_prize, cl.create_user, cl.create_date,
+               cl.last_modified_user, cl.last_modified_date
+        from weixin_clock cl
+        left join weixin_clock_group_classify wc on cl.weixin_clock_id = wc.weixin_clock_id
+        left join book_group_classify c on wc.book_group_classify_id = c.id
+        left join book_group_qrcode g ON c.id = g.classify_id
+        where g.weixin_group_id = #{wxGroupId} limit 1
+    </select>
+
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/weixinclock/WeixinClockCoupon.Mapper.xml

+<?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.pcloud.book.weixinclock.dao.impl.WeixinClockCouponDaoImpl" >
+    <resultMap id="BaseResultMap" type="com.pcloud.book.weixinclock.entity.WeixinClockCoupon" >
+        <id column="id" property="id" jdbcType="BIGINT" />
+        <result column="weixin_clock_id" property="weixinClockId" jdbcType="BIGINT"/>
+        <result column="coupon_platform" property="couponPlatform" jdbcType="INTEGER" />
+        <result column="title" property="title" jdbcType="VARCHAR" />
+        <result column="pict_url" property="pictUrl" jdbcType="VARCHAR" />
+        <result column="pro_origin_price" property="proOriginPrice" jdbcType="DECIMAL" />
+        <result column="coupon_price" property="couponPrice" jdbcType="DECIMAL" />
+        <result column="after_coupon_price" property="afterCouponPrice" jdbcType="DECIMAL" />
+        <result column="coupon_click_url" property="couponClickUrl" jdbcType="VARCHAR" />
+        <result column="day_num" property="dayNum" jdbcType="INTEGER"/>
+        <result column="create_user" property="createUser" jdbcType="BIGINT" />
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+        <result column="update_user" property="updateUser" jdbcType="BIGINT"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    </resultMap>
+    
+    <sql id="Base_Column_List">
+        id, weixin_clock_id, coupon_platform, title, pict_url, pro_origin_price, coupon_price, after_coupon_price, coupon_click_url, day_num,
+        create_user, create_time, update_user, update_time
+    </sql>
+
+    <insert id="insert" parameterType="com.pcloud.book.weixinclock.entity.WeixinClockCoupon" keyProperty="id" useGeneratedKeys="true">
+        insert into weixin_clock_coupon(weixin_clock_id, coupon_platform, title, pict_url,
+                                        pro_origin_price, coupon_price,
+                                        after_coupon_price, coupon_click_url, day_num,
+                                        create_user, create_time, update_user, update_time)
+        values (#{weixinClockId}, #{couponPlatform}, #{title}, #{pictUrl},
+                #{proOriginPrice}, #{couponPrice},
+                #{afterCouponPrice}, #{couponClickUrl}, #{dayNum},
+                #{createUser}, now(), #{updateUser}, now())
+    </insert>
+
+    <update id="update" parameterType="com.pcloud.book.weixinclock.entity.WeixinClockCoupon">
+        update weixin_clock_coupon
+        <set >
+            <if test="couponPlatform != null">
+                coupon_platform = #{couponPlatform},
+            </if>
+            <if test="title != null" >
+                title = #{title,jdbcType=VARCHAR},
+            </if>
+            <if test="pictUrl != null" >
+                pict_url = #{pictUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="proOriginPrice != null" >
+                pro_origin_price = #{proOriginPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="couponPrice != null" >
+                coupon_price = #{couponPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="afterCouponPrice != null" >
+                after_coupon_price = #{afterCouponPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="couponClickUrl != null" >
+                coupon_click_url = #{couponClickUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="dayNum != null">
+                day_num = #{dayNum},
+            </if>
+            <if test="updateUser != null">
+                update_user = #{updateUser},
+            </if>
+            update_time = NOW()
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="getBaseById" parameterType="long" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from weixin_clock_coupon where id = #{id}
+    </select>
+
+    <select id="getBaseByClockId" parameterType="long" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from weixin_clock_coupon where weixin_clock_id = #{weixinClockId}
+    </select>
+
+    <select id="getByClockIds" parameterType="list" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from weixin_clock_coupon where weixin_clock_id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+</mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/weixinclock/WeixinClockGroupClassify.Mapper.xml

@@ -15,6 +15,8 @@
         <result column="clock_introduction" property="clockIntroduction" jdbcType="VARCHAR"/>
         <result column="clock_prize_id" property="clockPrizeId" jdbcType="BIGINT"/>
         <result column="clock_prize_url" property="clockPrizeUrl" jdbcType="VARCHAR"/>
+        <result column="is_open_coupon" property="isOpenCoupon" jdbcType="INTEGER"/>
+        <result column="is_open_prize" property="isOpenPrize" jdbcType="INTEGER"/>
         <result column="create_user" property="createUser" jdbcType="BIGINT"/>
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP"/>
         <result column="last_modified_user" property="lastModifiedUser" jdbcType="BIGINT"/>
@@ -51,7 +53,7 @@
     <select id="getClockBaseInfoByClassify" parameterType="map" resultMap="ClockBaseInfoMap">
         SELECT
 	    wc.weixin_clock_id, wc.clock_keyword, wc.clock_guide, wc.clock_introduction, wc.clock_prize_id, wc.clock_prize_url, wc.create_user, wc.create_date,
-        wc.last_modified_user, wc.last_modified_date
+        wc.last_modified_user, wc.last_modified_date, wc.is_open_coupon, wc.is_open_prize
         FROM
 	        weixin_clock_group_classify wcc
         LEFT JOIN weixin_clock wc ON wcc.weixin_clock_id = wc.weixin_clock_id

pcloud-service-book/src/main/resources/mapper/weixinclock/WeixinClockUserCoupon.Mapper.xml

+<?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.pcloud.book.weixinclock.dao.impl.WeixinClockUserCouponDaoImpl" >
+    <resultMap id="BaseResultMap" type="com.pcloud.book.weixinclock.entity.WeixinClockUserCoupon">
+        <id column="id" property="id" jdbcType="BIGINT" />
+        <result column="weixin_clock_id" property="weixinClockId" jdbcType="BIGINT" />
+        <result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR" />
+        <result column="wx_group_id" property="wxGroupId" jdbcType="VARCHAR" />
+        <result column="wechat_user_id" property="wechatUserId" jdbcType="BIGINT" />
+        <result column="clock_coupon_id" property="clockCouponId" jdbcType="BIGINT" />
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    </resultMap>
+
+    <sql id="Base_Column_List" >
+        id, weixin_clock_id, wx_user_id, wx_group_id, wechat_user_id, clock_coupon_id, create_time, update_time
+    </sql>
+
+    <insert id="insert" parameterType="com.pcloud.book.weixinclock.entity.WeixinClockUserCoupon" useGeneratedKeys="true" keyProperty="id">
+        insert into weixin_clock_user_coupon (weixin_clock_id, wx_user_id, wx_group_id, wechat_user_id, clock_coupon_id, create_time, update_time)
+        values (#{weixinClockId}, #{wxUserId}, #{wxGroupId}, #{wechatUserId}, #{clockCouponId}, now(), now())
+    </insert>
+
+    <update id="update" parameterType="com.pcloud.book.weixinclock.entity.WeixinClockUserCoupon">
+        update weixin_clock_user_coupon
+        <set>
+            <if test="weixinClockId != null">
+                weixin_clock_id = #{weixinClockId},
+            </if>
+            <if test="wxUserId != null">
+                wx_user_id = #{wxUserId},
+            </if>
+            <if test="wxGroupId">
+                wx_group_id = #{wxGroupId},
+            </if>
+            <if test="wechatUserId != null">
+                wechat_user_id = #{wechatUserId},
+            </if>
+            <if test="clockCouponId != null">
+                clock_coupon_id = #{clockCouponId},
+            </if>
+            update_time = now(),
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="getByGroupAndUser" parameterType="map" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from weixin_clock_user_coupon
+        where wx_group_id = #{wxGroupId}
+        and wechat_user_id = #{wechatUserId}
+    </select>
+</mapper>
\ No newline at end of file