给第三方提供查询用户列表的接口，修改重置密码，修改优惠券的发放注册，修改邮箱模板。

src/main/java/com/diaoyun/zion/chinafrica/api/ThirdPartyController.java

 package com.diaoyun.zion.chinafrica.api;
 
 import com.diaoyun.zion.chinafrica.service.TbCfOrderService;
+import com.diaoyun.zion.chinafrica.service.TbCfUserInfoService;
+import com.diaoyun.zion.chinafrica.vo.TbCfUserVo;
 import com.diaoyun.zion.master.base.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,6 +12,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 提供给第三方api
  * @author G
@@ -24,6 +30,8 @@ public class ThirdPartyController {
 
 	@Autowired
     private TbCfOrderService tbCfOrderService;
+    @Autowired
+    private  TbCfUserInfoService tbCfUserInfoService;
 
     /**
      *获取某段时间的付款订单数据
@@ -69,4 +77,14 @@ public class ThirdPartyController {
     public Result getOrderDetailThird(@PathVariable("orderId")String orderId) {
         return tbCfOrderService.getOrderDetailThird(orderId);
     }
+    /**
+     * 获取用户列表
+     */
+    @ApiOperation(value = "获取用户列表")
+    @GetMapping(value ="/user")
+    public Result<List<TbCfUserVo>> getAllUser() {
+        Map<String,Object> map =new HashMap<>();
+        List<TbCfUserVo> list = tbCfUserInfoService.queryUserList(map);
+        return new Result<>(list);
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/controller/GoodsTypeController.java

@@ -5,7 +5,6 @@ import com.diaoyun.zion.chinafrica.entity.TbCfStationItemEntity;
 import com.diaoyun.zion.chinafrica.service.TbCfGoodstypeService;
 import com.diaoyun.zion.chinafrica.service.TbCfStationItemService;
 import com.diaoyun.zion.chinafrica.vo.StationToGoodsType;
-import com.diaoyun.zion.chinafrica.vo.TbCfOrderVo;
 import com.diaoyun.zion.master.base.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,9 +15,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.*;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -35,7 +34,6 @@ public class GoodsTypeController {
     @Autowired
     private TbCfStationItemService tbCfStationItemService;
 
-
     @RequestMapping("/getGoodsTypeList")
     @GetMapping
     public Map<String,List<StationToGoodsType>> getGoodsTypeList() {

src/main/java/com/diaoyun/zion/chinafrica/controller/LoginController.java

@@ -4,7 +4,6 @@ import com.diaoyun.zion.chinafrica.service.TbCfUserInfoService;
 import com.diaoyun.zion.chinafrica.vo.TbCfUserInfoVo;
 import com.diaoyun.zion.master.base.BaseController;
 import com.diaoyun.zion.master.base.Result;
-import com.diaoyun.zion.master.common.TokenManager;
 import com.diaoyun.zion.master.validator.Validator;
 import com.diaoyun.zion.master.validator.annotation.ValidateParam;
 import io.swagger.annotations.Api;
@@ -14,11 +13,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
 
 /**
  * 用户登录
@@ -40,12 +39,13 @@ public class LoginController extends BaseController {
 
     @ApiOperation(value = "注册并登录")
     @PostMapping(value = "/register")
-    public Result<TbCfUserInfoVo> registerAndLogin(@ApiParam("用户信息") @RequestBody TbCfUserInfoVo tbCfUserInfoVo) {
+    public Result<TbCfUserInfoVo> registerAndLogin(@ApiParam("用户信息") @RequestBody TbCfUserInfoVo tbCfUserInfoVo) throws ParseException {
         return tbCfUserInfoService.registerAndLogin(tbCfUserInfoVo);
     }
+
     @ApiOperation(value = "注册并登录")
     @PostMapping(value = "/registerByPhone")
-    public Result<TbCfUserInfoVo> registerByPhone(@ApiParam("用户信息") @RequestBody TbCfUserInfoVo tbCfUserInfoVo,@ApiParam(value = "验证码") @RequestParam("code") String code) {
+    public Result<TbCfUserInfoVo> registerByPhone(@ApiParam("用户信息") @RequestBody TbCfUserInfoVo tbCfUserInfoVo,@ApiParam(value = "验证码") @RequestParam("code") String code) throws  ParseException{
         return tbCfUserInfoService.registerByPhone(tbCfUserInfoVo,code);
     }
 
@@ -61,6 +61,7 @@ public class LoginController extends BaseController {
     public Result<TbCfUserInfoVo> loginByToken() {
         return tbCfUserInfoService.loginByToken(getIpAddr(request));
     }
+
     @ApiOperation("使用手机号登录")
     @GetMapping("/phone")
     public Result<TbCfUserInfoVo> loginByPhone(@ApiParam(value = "手机号") @RequestParam("phone") String phone,

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfCouponController.java

 package com.diaoyun.zion.chinafrica.controller;
 
-import com.diaoyun.zion.chinafrica.constant.KeyConstant;
 import com.diaoyun.zion.chinafrica.entity.CouponItem;
 import com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
 import com.diaoyun.zion.chinafrica.service.TbCfCouponService;
-import com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService;
+import com.diaoyun.zion.chinafrica.service.TbCfToiCouponService;
 import com.diaoyun.zion.chinafrica.vo.UserCouponVo;
 import com.diaoyun.zion.master.base.Result;
-import com.diaoyun.zion.master.common.RedisCache;
-import com.diaoyun.zion.master.enums.ResultCodeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 /**
  * 优惠券表Controller
@@ -36,7 +28,7 @@ public class TbCfCouponController {
     @Autowired
     private TbCfCouponService tbCfCouponService;
     @Autowired
-    private TbCfIssueCouponService tbCfIssueCouponService;
+    private TbCfToiCouponService tbCfToiCouponService;
     @ApiOperation("领取优惠券")
     @GetMapping("/take/{couponId}")
     public Result<TbCfCouponEntity> takeCoupon(@ApiParam("优惠券Id")@PathVariable("couponId")String couponId) {
@@ -56,7 +48,7 @@ public class TbCfCouponController {
     @ApiOperation("根据用户Id查询优惠券")
     @GetMapping("/queryCouponByUserId/{userId}")
     public Result<CouponItem> queryCouponByUserId(@ApiParam("用户Id")@PathVariable("userId") String userId) {
-        return tbCfIssueCouponService.queryCouponByUserId(userId);
+        return tbCfToiCouponService.queryCouponByUserId(userId);
     }
  /*   @ApiOperation("更改优惠券状态")
     @GetMapping("/changCouponStatus/{userId}/{couponId}")

src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfUserInfoController.java

 package com.diaoyun.zion.chinafrica.controller;
 
-import com.diaoyun.zion.chinafrica.constant.KeyConstant;
 import com.diaoyun.zion.chinafrica.service.TbCfUserInfoService;
 import com.diaoyun.zion.chinafrica.vo.TbCfUserInfoVo;
 import com.diaoyun.zion.master.base.BaseController;
 import com.diaoyun.zion.master.base.Result;
 import com.diaoyun.zion.master.enums.ResultCodeEnum;
-import com.diaoyun.zion.master.util.SMSUtil;
 import com.diaoyun.zion.master.validator.Validator;
 import com.diaoyun.zion.master.validator.annotation.ValidateParam;
 import freemarker.template.TemplateException;
@@ -19,10 +17,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLDecoder;
 
@@ -55,7 +52,6 @@ public class TbCfUserInfoController extends BaseController {
                                       @ApiParam("用户昵称 url编码") @PathVariable("nick") @ValidateParam({Validator.NOT_BLANK}) String nick) throws EmailException, TemplateException, IOException {
         nick= URLDecoder.decode(nick, Consts.UTF_8.name());
         tbCfUserInfoService.sendRegisterIdentifyCode(email, nick);
-
         //request.getSession().setAttribute(KeyConstant.IDENTIFY_CODE, identifyCode);
         // TODO 不能返回验证码，先做测试 identifyCode.toString(),
         return new Result("Verification code has been sent");
@@ -96,7 +92,6 @@ public class TbCfUserInfoController extends BaseController {
                                 @ApiParam("验证码") @PathVariable  Integer captcha) {
         return tbCfUserInfoService.resetPassWord(account,newPassword,captcha);
     }
-
     /**
      * 获取用户信息
      */
@@ -106,5 +101,4 @@ public class TbCfUserInfoController extends BaseController {
         return tbCfUserInfoService.getUserInfo();
     }
 
-
 }

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfCouponDao.java

 package com.diaoyun.zion.chinafrica.dao;
 
 import com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfTakeCouponEntity;
 import com.diaoyun.zion.master.dao.BaseDao;
 
 import java.util.Date;
@@ -56,4 +55,5 @@ public interface TbCfCouponDao extends BaseDao<TbCfCouponEntity> {
      */
     List<TbCfCouponEntity> getCouponAndVaildAll();
 
+    int updates(TbCfCouponEntity tbCfCoupon);
 }

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfIssueCouponDao.java

@@ -2,6 +2,7 @@ package com.diaoyun.zion.chinafrica.dao;
 
 import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity;
 import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
+import com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity;
 import com.diaoyun.zion.master.dao.BaseDao;
 
 import java.util.List;
@@ -18,4 +19,6 @@ public interface TbCfIssueCouponDao extends BaseDao<TbCfIssueCouponEntity> {
 
 
     void changeCoupnStatus(String userId, String couponId);
+
+    int saves(TbCfToiCouponEntity toiCouponEntity);
 }

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfToiCouponDao.java

+package com.diaoyun.zion.chinafrica.dao;
+
+
+import com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntityExtends;
+import com.diaoyun.zion.master.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * Dao
+ *
+ * @author lipengjun
+ * @date 2019-11-20 19:37:20
+ */
+public interface TbCfToiCouponDao extends BaseDao<TbCfToiCouponEntity> {
+
+    int saveAndSubmit(TbCfToiCouponEntity tbCfToiCoupon);
+
+    int saves(TbCfToiCouponEntity toi);
+    List<TbCfToiCouponEntityExtends> queryCouponByUserId(String userId);
+
+    int changeCoupnStatus(String userId, String couponId);
+}

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfUserInfoDao.java

@@ -2,8 +2,12 @@ package com.diaoyun.zion.chinafrica.dao;
 
 
 import com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity;
+import com.diaoyun.zion.chinafrica.vo.TbCfUserVo;
 import com.diaoyun.zion.master.dao.BaseDao;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户表Dao
  *
@@ -39,4 +43,13 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
      * @return
      */
     int updatePassWord(String userId, String newPassword);
+
+    /**
+     * 根据邮箱查询用户信息
+     * @return
+     */
+    TbCfUserInfoEntity findByEmail(String email);
+
+    List<TbCfUserVo> queryUserList(Map<String, Object> map);
+
 }

src/main/java/com/diaoyun/zion/chinafrica/entity/CouponItem.java

@@ -3,13 +3,24 @@ package com.diaoyun.zion.chinafrica.entity;
 import java.util.List;
 
 public class CouponItem {
-    private List<TbCfIssueCouponEntityExtends> couponList;
+    private List<TbCfToiCouponEntityExtends> couponList;
 
-    public List<TbCfIssueCouponEntityExtends> getCouponList() {
+    private List<TbCfIssueCouponEntityExtends> couponsList;
+
+
+    public List<TbCfToiCouponEntityExtends> getCouponList() {
         return couponList;
     }
 
-    public void setCouponList(List<TbCfIssueCouponEntityExtends> couponList) {
+    public void setCouponList(List<TbCfToiCouponEntityExtends> couponList) {
         this.couponList = couponList;
     }
+
+    public List<TbCfIssueCouponEntityExtends> getCouponsList() {
+        return couponsList;
+    }
+
+    public void setCouponsList(List<TbCfIssueCouponEntityExtends> couponsList) {
+        this.couponsList = couponsList;
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfCouponEntity.java

@@ -35,7 +35,7 @@ public class TbCfCouponEntity implements Serializable {
     /**
      * 优惠券类型
      */
-    @ApiModelProperty("优惠券类型名称")
+    @ApiModelProperty("优惠券类型名称（暂无用）")
     private String couponCategoryName;
     /**
      * 可用于类目
@@ -136,43 +136,30 @@ public class TbCfCouponEntity implements Serializable {
      * 设置：设置是否是注册就是的优惠券，(0)默认状态，（1）是用户注册就送这张优惠券
      */
 
-    public void setCouponVaild(Integer couponVaild) {
-        this.couponVaild = couponVaild;
+    public String getIssCouponId() {
+        return issCouponId;
     }
 
-    /**
-     * 获取：设置是否是注册就是的优惠券，(0)默认状态，（1）是用户注册就送这张优惠券
-     */
-    public Integer getCouponVaild() {
-        return couponVaild;
-    }
-    /**
-     * 设置：优惠券id
-     */
-    public void setCouponId(String couponId) {
-        this.couponId = couponId;
+    public void setIssCouponId(String issCouponId) {
+        this.issCouponId = issCouponId;
     }
 
-    /**
-     * 获取：优惠券id
-     */
     public String getCouponId() {
         return couponId;
     }
-    /**
-     * 设置：优惠券类型
-     */
-    public void setCouponCategoryId(String couponCategoryId) {
-        this.couponCategoryId = couponCategoryId;
+
+    public void setCouponId(String couponId) {
+        this.couponId = couponId;
     }
 
-    /**
-     * 获取：优惠券类型
-     */
     public String getCouponCategoryId() {
         return couponCategoryId;
     }
 
+    public void setCouponCategoryId(String couponCategoryId) {
+        this.couponCategoryId = couponCategoryId;
+    }
+
     public String getCouponCategoryName() {
         return couponCategoryName;
     }
@@ -181,246 +168,155 @@ public class TbCfCouponEntity implements Serializable {
         this.couponCategoryName = couponCategoryName;
     }
 
-    /**
-     * 设置：可用于
-     */
-    public void setCouponUse(Integer couponUse) {
-        this.couponUse = couponUse;
-    }
-
-    /**
-     * 获取：可用于
-     */
     public Integer getCouponUse() {
         return couponUse;
     }
-    /**
-     * 设置：优惠券标题
-     */
-    public void setCouponTitle(String couponTitle) {
-        this.couponTitle = couponTitle;
+
+    public void setCouponUse(Integer couponUse) {
+        this.couponUse = couponUse;
     }
 
-    /**
-     * 获取：优惠券标题
-     */
     public String getCouponTitle() {
         return couponTitle;
     }
-    /**
-     * 设置：优惠券图片地址
-     */
-    public void setCouponIcon(String couponIcon) {
-        this.couponIcon = couponIcon;
+
+    public void setCouponTitle(String couponTitle) {
+        this.couponTitle = couponTitle;
     }
 
-    /**
-     * 获取：优惠券图片地址
-     */
     public String getCouponIcon() {
         return couponIcon;
     }
-    /**
-     * 设置：那些站点可以使用,1111为全部
-     */
-    public void setWithStationId(String withStationId) {
-        this.withStationId = withStationId;
+
+    public void setCouponIcon(String couponIcon) {
+        this.couponIcon = couponIcon;
     }
 
-    /**
-     * 获取：那些站点可以使用,1111为全部
-     */
     public String getWithStationId() {
         return withStationId;
     }
-    /**
-     * 设置：满多少金额可以使用
-     */
-    public void setWithAmount(BigDecimal withAmount) {
-        this.withAmount = withAmount;
+
+    public void setWithStationId(String withStationId) {
+        this.withStationId = withStationId;
     }
 
-    /**
-     * 获取：满多少金额可以使用
-     */
     public BigDecimal getWithAmount() {
         return withAmount;
     }
-    /**
-     * 设置：抵扣金额
-     */
-    public void setDeductAmount(BigDecimal deductAmount) {
-        this.deductAmount = deductAmount;
+
+    public void setWithAmount(BigDecimal withAmount) {
+        this.withAmount = withAmount;
     }
 
-    /**
-     * 获取：抵扣金额
-     */
     public BigDecimal getDeductAmount() {
         return deductAmount;
     }
-    /**
-     * 设置：发券数量
-     */
-    public void setQuato(Integer quato) {
-        this.quato = quato;
+
+    public void setDeductAmount(BigDecimal deductAmount) {
+        this.deductAmount = deductAmount;
     }
 
-    /**
-     * 获取：发券数量
-     */
     public Integer getQuato() {
         return quato;
     }
-    /**
-     * 设置：已领取数量
-     */
-    public void setTakeCount(Integer takeCount) {
-        this.takeCount = takeCount;
+
+    public void setQuato(Integer quato) {
+        this.quato = quato;
     }
 
-    /**
-     * 获取：已领取数量
-     */
     public Integer getTakeCount() {
         return takeCount;
     }
-    /**
-     * 设置：已使用数量
-     */
-    public void setUsedCount(Integer usedCount) {
-        this.usedCount = usedCount;
+
+    public void setTakeCount(Integer takeCount) {
+        this.takeCount = takeCount;
     }
 
-    /**
-     * 获取：已使用数量
-     */
     public Integer getUsedCount() {
         return usedCount;
     }
-    /**
-     * 设置：发放开始时间
-     */
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
+
+    public void setUsedCount(Integer usedCount) {
+        this.usedCount = usedCount;
     }
 
-    /**
-     * 获取：发放开始时间
-     */
     public Date getStartTime() {
         return startTime;
     }
-    /**
-     * 设置：发放结束时间
-     */
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
     }
 
-    /**
-     * 获取：发放结束时间
-     */
     public Date getEndTime() {
         return endTime;
     }
-    /**
-     * 设置：有效开始时间
-     */
-    public void setValidStartTime(Date validStartTime) {
-        this.validStartTime = validStartTime;
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
     }
 
-    /**
-     * 获取：有效开始时间
-     */
     public Date getValidStartTime() {
         return validStartTime;
     }
-    /**
-     * 设置：有效结束时间
-     */
-    public void setValidEndTime(Date validEndTime) {
-        this.validEndTime = validEndTime;
+
+    public void setValidStartTime(Date validStartTime) {
+        this.validStartTime = validStartTime;
     }
 
-    /**
-     * 获取：有效结束时间
-     */
     public Date getValidEndTime() {
         return validEndTime;
     }
-    /**
-     * 设置：有效标志,0无效,1生效,2过期
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
+
+    public void setValidEndTime(Date validEndTime) {
+        this.validEndTime = validEndTime;
     }
 
-    /**
-     * 获取：有效标志,0无效,1生效,2过期
-     */
     public Integer getStatus() {
         return status;
     }
-    /**
-     * 设置：创建人
-     */
-    public void setCreateUserId(String createUserId) {
-        this.createUserId = createUserId;
+
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
-    /**
-     * 获取：创建人
-     */
     public String getCreateUserId() {
         return createUserId;
     }
-    /**
-     * 设置：创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
     }
 
-    /**
-     * 获取：创建时间
-     */
     public Date getCreateTime() {
         return createTime;
     }
-    /**
-     * 设置：修改人
-     */
-    public void setUpdateUserId(String updateUserId) {
-        this.updateUserId = updateUserId;
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
-    /**
-     * 获取：修改人
-     */
     public String getUpdateUserId() {
         return updateUserId;
     }
-    /**
-     * 设置：修改时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+
+    public void setUpdateUserId(String updateUserId) {
+        this.updateUserId = updateUserId;
     }
 
-    /**
-     * 获取：修改时间
-     */
     public Date getUpdateTime() {
         return updateTime;
     }
 
-    public String getIssCouponId() {
-        return issCouponId;
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
     }
 
-    public void setIssCouponId(String issCouponId) {
-        this.issCouponId = issCouponId;
+    public Integer getCouponVaild() {
+        return couponVaild;
+    }
+
+    public void setCouponVaild(Integer couponVaild) {
+        this.couponVaild = couponVaild;
     }
 }

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfToiCouponEntity.java

+package com.diaoyun.zion.chinafrica.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 实体
+ * 表名 tb_cf_toicoupon
+ *
+ * @author lipengjun
+ * @date 2019-11-20 19:37:20
+ */
+public class TbCfToiCouponEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 发放/领取表id
+     */
+    private String toitableId;
+    /**
+     * 优惠券id
+     */
+    private String couponId;
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 标识(1发放，2领取，3注册)
+     */
+    private Integer identification;
+    /**
+     * 是否已使用(0已使用，1未使用)
+     */
+    private Integer enableFlag;
+
+    /**
+     * 设置：发放/领取表id
+     */
+    public void setToitableId(String toitableId) {
+        this.toitableId = toitableId;
+    }
+
+    /**
+     * 获取：发放/领取表id
+     */
+    public String getToitableId() {
+        return toitableId;
+    }
+    /**
+     * 设置：优惠券id
+     */
+    public void setCouponId(String couponId) {
+        this.couponId = couponId;
+    }
+
+    /**
+     * 获取：优惠券id
+     */
+    public String getCouponId() {
+        return couponId;
+    }
+    /**
+     * 设置：用户id
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取：用户id
+     */
+    public String getUserId() {
+        return userId;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：标识(1发放，2领取，3注册)
+     */
+    public void setIdentification(Integer identification) {
+        this.identification = identification;
+    }
+
+    /**
+     * 获取：标识(1发放，2领取，3注册)
+     */
+    public Integer getIdentification() {
+        return identification;
+    }
+    /**
+     * 设置：是否已使用(0已使用，1未使用)
+     */
+    public void setEnableFlag(Integer enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+
+    /**
+     * 获取：是否已使用(0已使用，1未使用)
+     */
+    public Integer getEnableFlag() {
+        return enableFlag;
+    }
+}

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfToiCouponEntityExtends.java

+package com.diaoyun.zion.chinafrica.entity;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class TbCfToiCouponEntityExtends extends TbCfToiCouponEntity {
+    private BigDecimal amount;
+    private BigDecimal money; 
+
+    private String  start;
+    private String  end;
+
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setStart(Date start) {
+        SimpleDateFormat format=new SimpleDateFormat("yyyy/MM/dd");
+        String startTime = format.format(start);
+        this.start = startTime;
+    }
+
+    public String getStart() {
+        return start;
+    }
+
+    public String getEnd() {
+        return end;
+    }
+
+    public void setEnd(Date end) {
+        SimpleDateFormat format=new SimpleDateFormat("yyyy/MM/dd");
+        String endTime = format.format(end);
+        this.end = endTime;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+}

src/main/java/com/diaoyun/zion/chinafrica/enums/CouponCategoryEnum.java

@@ -14,8 +14,10 @@ public enum CouponCategoryEnum implements EnumItemable<CouponCategoryEnum> {
 	 * 优惠卷类型枚举
 	 */
 	SHOP("购物返券", 10),
-	REGISTER("注册", 20),
-	INVITE("邀请", 30);
+	REGISTER("注册返券", 20),
+	INVITE("邀请返券", 30),
+	TAKE("用户领券", 40),
+	ISSUE("发放优惠券", 50);
 
 	private String label;
 	private Integer value;

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfCouponService.java

@@ -101,4 +101,6 @@ public interface TbCfCouponService {
      *如果vaild 是1的话就是注册就送该优惠券，可以是送一张也可以送多张
      */
     List<TbCfCouponEntity> getCouponAndVaildAll();
+
+    int updates(TbCfCouponEntity tbCfCoupon);
 }

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfIssueCouponService.java

 package com.diaoyun.zion.chinafrica.service;
 
-import com.diaoyun.zion.chinafrica.entity.CouponItem;
-import com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
+import com.diaoyun.zion.chinafrica.entity.*;
 import com.diaoyun.zion.master.base.Result;
 
 import java.util.List;
@@ -48,6 +45,7 @@ public interface TbCfIssueCouponService {
      * @param tbCfCouponIssue
      * @param tbCfIssueCoupon 实体
      * @param userId
+     * @param issueCouponEntity
      * @return 保存条数
      */
     int save(TbCfIssueCouponEntity issueCouponEntity);

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfToiCouponService.java

+package com.diaoyun.zion.chinafrica.service;
+
+
+import com.diaoyun.zion.chinafrica.entity.CouponItem;
+import com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity;
+import com.diaoyun.zion.master.base.Result;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service接口
+ *
+ * @author lipengjun
+ * @date 2019-11-20 19:37:20
+ */
+public interface TbCfToiCouponService {
+
+     Result<CouponItem> queryCouponByUserId(String userId);
+
+    /**
+     * 根据主键查询实体
+     *
+     * @param id 主键
+     * @return 实体
+     */
+    TbCfToiCouponEntity queryObject(String toitableId);
+
+    /**
+     * 分页查询
+     *
+     * @param map 参数
+     * @return list
+     */
+    List<TbCfToiCouponEntity> queryList(Map<String, Object> map);
+
+    /**
+     * 分页统计总数
+     *
+     * @param map 参数
+     * @return 总数
+     */
+    int queryTotal(Map<String, Object> map);
+
+    /**
+     * 保存实体
+     *
+     * @param tbCfToicoupon 实体
+     * @return 保存条数
+     */
+    int save(TbCfToiCouponEntity tbCfToicoupon);
+
+    /**
+     * 根据主键更新实体
+     *
+     * @param tbCfToicoupon 实体
+     * @return 更新条数
+     */
+    int update(TbCfToiCouponEntity tbCfToicoupon);
+
+    /**
+     * 根据主键删除
+     *
+     * @param toitableId
+     * @return 删除条数
+     */
+    int delete(String toitableId);
+
+    /**
+     * 根据主键批量删除
+     *
+     * @param toitableIds
+     * @return 删除条数
+     */
+    int deleteBatch(String[] toitableIds);
+
+    /**
+     * 保存用户的优惠券
+     * @param tbCfCouponIssue
+     * @param tbCfToiCoupon
+     * @param userId
+     * @return
+     */
+    int saveAndSubmit(TbCfCouponIssueEntity tbCfCouponIssue, TbCfToiCouponEntity tbCfToiCoupon, String userId);
+
+    int saves(TbCfToiCouponEntity toi);
+}

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfUserInfoService.java

@@ -2,15 +2,14 @@ package com.diaoyun.zion.chinafrica.service;
 
 import com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity;
 import com.diaoyun.zion.chinafrica.vo.TbCfUserInfoVo;
+import com.diaoyun.zion.chinafrica.vo.TbCfUserVo;
 import com.diaoyun.zion.master.base.Result;
 import freemarker.template.TemplateException;
-import io.swagger.annotations.ApiParam;
 import org.apache.commons.mail.EmailException;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -83,7 +82,7 @@ public interface TbCfUserInfoService {
      * 发送注册验证码
      * @param email
      * @return
-     */
+             */
     Integer sendRegisterIdentifyCode(String email,String nick) throws EmailException, TemplateException, IOException;
 
     /**
@@ -91,14 +90,14 @@ public interface TbCfUserInfoService {
      * @param tbCfUserInfoVo
      * @return
      */
-    Result registerAndLogin(TbCfUserInfoVo tbCfUserInfoVo);
+    Result registerAndLogin(TbCfUserInfoVo tbCfUserInfoVo) throws ParseException;
 
     /**
      *通过手机注册
      * @param tbCfUserInfoVo
      * @return
      */
-    Result<TbCfUserInfoVo> registerByPhone(TbCfUserInfoVo tbCfUserInfoVo,String code);
+    Result<TbCfUserInfoVo> registerByPhone(TbCfUserInfoVo tbCfUserInfoVo,String code) throws  ParseException;
     /**
      * 用户登录
      * @param ipAddr
@@ -175,4 +174,6 @@ public interface TbCfUserInfoService {
      * @return
      */
     Result<TbCfUserInfoVo> getUserInfo();
+
+    List<TbCfUserVo> queryUserList(Map<String, Object> map);
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/ShopifyServiceImpl.java

@@ -7,17 +7,12 @@ import com.diaoyun.zion.master.base.Result;
 import com.diaoyun.zion.master.common.RedisCache;
 import com.diaoyun.zion.master.enums.ResultCodeEnum;
 import com.diaoyun.zion.master.util.HttpClientUtil;
-import com.github.pagehelper.PageInfo;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import netscape.javascript.JSObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -65,6 +60,7 @@ public class ShopifyServiceImpl implements ShopifyService {
                 list.add(data);
                 redisCache.set(KeyConstant.SHOPIFY_ITEMS, list);
             }
+            System.out.println(list);
             JSONArray jsonArr = JSONArray.fromObject(list);
             result.setData(jsonArr).setMessage("success");
         } catch (IOException e) {

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfCouponServiceImpl.java

@@ -157,6 +157,11 @@ public class TbCfCouponServiceImpl implements TbCfCouponService {
         return tbCfCouponDao.getCouponAndVaildAll();
     }
 
+    @Override
+    public int updates(TbCfCouponEntity tbCfCoupon) {
+        return tbCfCouponDao.updates(tbCfCoupon);
+    }
+
     /**
      * 抢优惠券
      * 若能抢到，则返回优惠券，否则返回空

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfIssueCouponServiceImpl.java

 package com.diaoyun.zion.chinafrica.service.impl;
 
 import com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao;
-import com.diaoyun.zion.chinafrica.entity.CouponItem;
-import com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntityExtends;
+import com.diaoyun.zion.chinafrica.entity.*;
 import com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService;
 import com.diaoyun.zion.master.base.Result;
-import com.diaoyun.zion.master.util.IdUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -67,7 +62,7 @@ public class TbCfIssueCouponServiceImpl implements TbCfIssueCouponService {
     public Result<CouponItem> queryCouponByUserId(String userId){
         List<TbCfIssueCouponEntityExtends> list = tbCfIssueCouponDao.queryCouponByUserId(userId);
         CouponItem couponItem=new CouponItem();
-        couponItem.setCouponList(list);
+        couponItem.setCouponsList(list);
         return new Result<>(couponItem);
     }
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -4,7 +4,6 @@ import com.diaoyun.zion.chinafrica.bis.impl.StripePay;
 import com.diaoyun.zion.chinafrica.constant.KeyConstant;
 import com.diaoyun.zion.chinafrica.dao.*;
 import com.diaoyun.zion.chinafrica.entity.*;
-import com.diaoyun.zion.chinafrica.enums.CouponCategoryEnum;
 import com.diaoyun.zion.chinafrica.enums.DeliveryStatusEnum;
 import com.diaoyun.zion.chinafrica.enums.OrderStatusEnum;
 import com.diaoyun.zion.chinafrica.service.*;
@@ -19,7 +18,10 @@ import com.diaoyun.zion.master.common.TokenManager;
 import com.diaoyun.zion.master.config.DomainProperties;
 import com.diaoyun.zion.master.enums.ResultCodeEnum;
 import com.diaoyun.zion.master.security.JwtTokenProvider;
-import com.diaoyun.zion.master.util.*;
+import com.diaoyun.zion.master.util.AESUtils;
+import com.diaoyun.zion.master.util.GsonUtil;
+import com.diaoyun.zion.master.util.HttpClientUtil;
+import com.diaoyun.zion.master.util.IdUtil;
 import com.diaoyun.zion.master.validator.Validator;
 import com.github.pagehelper.PageInfo;
 import com.stripe.exception.StripeException;
@@ -75,7 +77,8 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
     private TbCfCouponUseDao tbCfCouponUseDao;
     @Autowired
     private TbCfFinanceDao tbCfFinanceDao;
-
+    @Autowired
+    private TbCfToiCouponDao tbCfToiCouponDao;
     @Autowired
     private TbCfExpressTemplateDao tbCfExpressTemplateDao;
     @Autowired
@@ -224,7 +227,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
                     BeanUtils.copyProperties(tbCfItemDetail, tbCfCartItemDetailVo);
                     itemDetailVoList.add(tbCfCartItemDetailVo);
                 }
-
                 orderVo.setItemDetailList(itemDetailVoList);
                 tbCfOrderVoList.add(orderVo);
             }
@@ -278,13 +280,13 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
                     changeOrderState(charge.getId(), tbCfOrderVo);
                     //修改使用的优惠券的状态
                     if(tbCfOrderVo.getOrderStatus()==20){
-                        tbCfIssueCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(),tbCfOrderVo.getCouponId());
+                        tbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(),tbCfOrderVo.getCouponId());
                     }
                     //生成流水记录
                     TbCfFinanceEntity tbCfFinance = createFinance(charge, tbCfOrderVo);
                     TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
                     BeanUtils.copyProperties(tbCfFinance, tbCfFinanceVo);
-                   /* //赠送购物返券
+                   /*//赠送购物返券
                     List<TbCfCouponEntity> couponList = tbCfCouponDao.getCouponByCategory(CouponCategoryEnum.SHOP.getValue(), new Date());
                     if (!couponList.isEmpty()) {
                         //领取优惠券

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfToiCouponServiceImpl.java

+package com.diaoyun.zion.chinafrica.service.impl;
+
+
+import com.diaoyun.zion.chinafrica.dao.TbCfToiCouponDao;
+import com.diaoyun.zion.chinafrica.entity.CouponItem;
+import com.diaoyun.zion.chinafrica.entity.TbCfCouponIssueEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity;
+import com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntityExtends;
+import com.diaoyun.zion.chinafrica.service.TbCfToiCouponService;
+import com.diaoyun.zion.master.base.Result;
+import com.diaoyun.zion.master.util.IdUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service实现类
+ *
+ * @author lipengjun
+ * @date 2019-11-20 19:37:20
+ */
+@Service("tbCfToiCouponService")
+public class TbCfToiCouponServiceImpl implements TbCfToiCouponService {
+    @Autowired
+    private TbCfToiCouponDao tbCfToiCouponDao;
+
+    @Override
+    public Result<CouponItem> queryCouponByUserId(String userId) {
+        List<TbCfToiCouponEntityExtends> list = tbCfToiCouponDao.queryCouponByUserId(userId);
+        CouponItem couponItem=new CouponItem();
+        couponItem.setCouponList(list);
+        return new Result<>(couponItem);
+    }
+
+    @Override
+    public TbCfToiCouponEntity queryObject(String toitableId) {
+        return tbCfToiCouponDao.queryObject(toitableId);
+    }
+
+    @Override
+    public List<TbCfToiCouponEntity> queryList(Map<String, Object> map) {
+        return tbCfToiCouponDao.queryList(map);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        return tbCfToiCouponDao.queryTotal(map);
+    }
+
+    @Override
+    public int save(TbCfToiCouponEntity tbCfToicoupon) {
+        tbCfToicoupon.setToitableId(IdUtil.createIdbyUUID());
+        return tbCfToiCouponDao.save(tbCfToicoupon);
+    }
+    @Override
+    public int saves(TbCfToiCouponEntity toi) {
+        toi.setToitableId(IdUtil.createIdbyUUID());
+        return tbCfToiCouponDao.saves(toi);
+    }
+
+    @Override
+    public int update(TbCfToiCouponEntity tbCfToicoupon) {
+        return tbCfToiCouponDao.update(tbCfToicoupon);
+    }
+
+    @Override
+    public int delete(String toitableId) {
+        return tbCfToiCouponDao.delete(toitableId);
+    }
+
+    @Override
+    public int deleteBatch(String[] toitableIds) {
+        return tbCfToiCouponDao.deleteBatch(toitableIds);
+    }
+
+    @Override
+    public int saveAndSubmit(TbCfCouponIssueEntity tbCfCouponIssue, TbCfToiCouponEntity tbCfToiCoupon, String userId) {
+        tbCfToiCoupon.setToitableId(IdUtil.createIdbyUUID());
+        tbCfToiCoupon.setCouponId(tbCfCouponIssue.getCouponId());
+        tbCfToiCoupon.setUserId(userId);
+        tbCfToiCoupon.setCreateTime(new Date());
+        tbCfToiCoupon.setIdentification(1);
+        tbCfToiCoupon.setEnableFlag(1);
+        return tbCfToiCouponDao.saveAndSubmit(tbCfToiCoupon);
+    }
+}

src/main/java/com/diaoyun/zion/chinafrica/vo/CouponIssueVo.java

+package com.diaoyun.zion.chinafrica.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 优惠券领取情况
+ * 表名 tb_cf_coupon
+ *
+ * @author lipengjun
+ * @date 2019-09-20 11:03:38
+ */
+public class CouponIssueVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 优惠券id
+     */
+    private String couponId;
+    /**
+     * 优惠券类型
+     */
+    private String  couponCategoryId;
+    /**
+     * 优惠券标题
+     */
+    private String couponTitle;
+    /**
+     * 优惠券图片地址
+     */
+    private String couponIcon;
+    /**
+     * 用户名
+     */
+    private String nick;
+    /**
+     * 账号
+     */
+    private String account;
+    /**
+     * 领取时间
+     */
+    private Date createTime;
+    /**
+     * 是否已经使用，0已使用，1未使用
+     */
+    private Integer enableFlag;
+
+    /**
+     * 标识(1发放，2领取，3注册)
+     */
+    private Integer identification;
+    public String getCouponId() {
+        return couponId;
+    }
+
+    public void setCouponId(String couponId) {
+        this.couponId = couponId;
+    }
+
+    public String getCouponCategoryId() {
+        return couponCategoryId;
+    }
+
+    public void setCouponCategoryId(String couponCategoryId) {
+        this.couponCategoryId = couponCategoryId;
+    }
+
+    public String getCouponTitle() {
+        return couponTitle;
+    }
+
+    public void setCouponTitle(String couponTitle) {
+        this.couponTitle = couponTitle;
+    }
+
+    public String getCouponIcon() {
+        return couponIcon;
+    }
+
+    public void setCouponIcon(String couponIcon) {
+        this.couponIcon = couponIcon;
+    }
+
+    public String getNick() {
+        return nick;
+    }
+
+    public void setNick(String nick) {
+        this.nick = nick;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getEnableFlag() {
+        return enableFlag;
+    }
+
+    public void setEnableFlag(Integer enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+    /**
+     * 设置：标识(1发放，2领取，3注册)
+     */
+    public void setIdentification(Integer identification) {
+        this.identification = identification;
+    }
+
+    /**
+     * 获取：标识(1发放，2领取，3注册)
+     */
+    public Integer getIdentification() {
+        return identification;
+    }
+}

src/main/java/com/diaoyun/zion/chinafrica/vo/TbCfUserVo.java

+package com.diaoyun.zion.chinafrica.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TbCfUserVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 用户编号
+     */
+    private String userNo;
+    /**
+     * 用户名
+     */
+    private String userName;
+    /**
+     * 电话号码
+     */
+    private String phone;
+    /**
+     * 上一次登录时间
+     */
+    private Date lastLoginTime;
+    /**
+     * 默认地址id
+     */
+    private String defaultAddressId;
+    /**
+     * 默认地址
+     */
+    private String defaultAddressName;
+    /**
+     * 是否有效
+     */
+    private Integer enableFlag;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserNo() {
+        return userNo;
+    }
+
+    public void setUserNo(String userNo) {
+        this.userNo = userNo;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Date getLastLoginTime() {
+        return lastLoginTime;
+    }
+
+    public void setLastLoginTime(Date lastLoginTime) {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    public String getDefaultAddressId() {
+        return defaultAddressId;
+    }
+
+    public void setDefaultAddressId(String defaultAddressId) {
+        this.defaultAddressId = defaultAddressId;
+    }
+
+    public String getDefaultAddressName() {
+        return defaultAddressName;
+    }
+
+    public void setDefaultAddressName(String defaultAddressName) {
+        this.defaultAddressName = defaultAddressName;
+    }
+
+    public Integer getEnableFlag() {
+        return enableFlag;
+    }
+
+    public void setEnableFlag(Integer enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+}

src/main/java/com/diaoyun/zion/chinafrica/vo/ToiCouponVo.java

+package com.diaoyun.zion.chinafrica.vo;
+
+import java.io.Serializable;
+
+/**
+ * 领取或者发放优惠券实体类
+ */
+public class ToiCouponVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 表id
+     */
+    private String couponTableId;
+    /**
+     * 优惠券id
+     */
+    private String couponId;
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 创建日期
+     */
+    private String createTime;
+    /**
+     * 标识(1.发放 2.领取 3.注册)
+     */
+    private Integer identification;
+    /**
+     * 是否已经使用，0已使用，1未使用，2已过期
+     */
+    private Integer enableFlag;
+
+    /**
+     * 获取：表id
+     */
+    public String getCouponTableId() {
+        return couponTableId;
+    }
+    /**
+     * 设置：表id
+     */
+    public void setCouponTableId(String couponTableId) {
+        this.couponTableId = couponTableId;
+    }
+    /**
+     * 获取：标识(1.发放 2.领取 3.注册)
+     */
+    public Integer getIdentification() {
+        return identification;
+    }
+    /**
+     * 设置：标识(1.发放 2.领取 3.注册)
+     */
+    public void setIdentification(Integer identification) {
+        this.identification = identification;
+    }
+
+    /**
+     * 设置：优惠券id
+     */
+    public void setCouponId(String couponId) {
+        this.couponId = couponId;
+    }
+
+    /**
+     * 获取：优惠券id
+     */
+    public String getCouponId() {
+        return couponId;
+    }
+    /**
+     * 设置：用户id
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取：用户id
+     */
+    public String getUserId() {
+        return userId;
+    }
+    /**
+     * 设置：创建日期
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建日期
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：是否已经使用，0已使用，1未使用，2已过期
+     */
+    public void setEnableFlag(Integer enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+
+    /**
+     * 获取：是否已经使用，0已使用，1未使用，2已过期
+     */
+    public Integer getEnableFlag() {
+        return enableFlag;
+    }
+}

src/main/java/com/diaoyun/zion/master/util/EmailHelper.java

@@ -5,7 +5,6 @@ import com.diaoyun.zion.master.config.DomainProperties;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
-import freemarker.template.TemplateExceptionHandler;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.HtmlEmail;
 import org.apache.http.Consts;
@@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

src/main/resources/mapper/TbCfCouponDao.xml

@@ -25,14 +25,12 @@
 		<result property="updateUserId" column="update_user_id"/>
 		<result property="updateTime" column="update_time"/>
 		<result property="couponVaild" column="coupon_vaild"/>
-		<result property="couponIssuetableId" column="coupon_issuetable_id"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
 		select
 			`coupon_id`,
-			b.coupon_category_id,
-			b.coupon_category_name,
+			`coupon_category_id`,
 			`coupon_use`,
 			`coupon_title`,
 			`coupon_icon`,
@@ -52,15 +50,14 @@
 			`update_user_id`,
 			`update_time`,
 			`coupon_vaild`
-		from tb_cf_coupon a left join tb_cf_coupon_category b on a.coupon_category_id = b.coupon_category_id
+		from tb_cf_coupon a
 		where coupon_id = #{id}
 	</select>
 
 	<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
 		select
 		`coupon_id`,
-		b.coupon_category_id,
-		b.coupon_category_name,
+		`coupon_category_id`,
 		`coupon_use`,
 		`coupon_title`,
 		`coupon_icon`,
@@ -80,7 +77,7 @@
 		`update_user_id`,
 		`update_time`,
 		`coupon_vaild`
-		from tb_cf_coupon a left join tb_cf_coupon_category b on a.coupon_category_id = b.coupon_category_id
+		from tb_cf_coupon a
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')
@@ -152,6 +149,52 @@
 			#{updateTime}),
 			#{coupon_vaild})
 	</insert>
+	<insert id="saves" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
+		insert into tb_cf_coupon(
+			`coupon_id`,
+			`coupon_category_id`,
+			`coupon_use`,
+			`coupon_title`,
+			`coupon_icon`,
+			`with_station_id`,
+			`with_amount`,
+			`deduct_amount`,
+			`quato`,
+			`take_count`,
+			`used_count`,
+			`start_time`,
+			`end_time`,
+			`valid_start_time`,
+			`valid_end_time`,
+			`status`,
+			`create_user_id`,
+			`create_time`,
+			`update_user_id`,
+			`update_time`,
+			`coupon_vaild`)
+		values(
+			#{couponId},
+			#{couponCategoryId},
+			#{couponUse},
+			#{couponTitle},
+			#{couponIcon},
+			#{withStationId},
+			#{withAmount},
+			#{deductAmount},
+			#{quato},
+			#{takeCount},
+			#{usedCount},
+			#{startTime},
+			#{endTime},
+			#{validStartTime},
+			#{validEndTime},
+			#{status},
+			#{createUserId},
+			#{createTime},
+			#{updateUserId},
+			#{updateTime}),
+			#{coupon_vaild})
+	</insert>
 
 	<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
 		update tb_cf_coupon
@@ -178,8 +221,34 @@
 			<if test="couponVaild != null">`coupon_vaild` = #{couponVaild}</if>
 		</set>
 		where coupon_id = #{couponId}
-	</update>
 
+	</update>
+	<update id="updates" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
+		update tb_cf_coupon
+		<set>
+			<if test="couponCategoryId != null">`coupon_category_id` = #{couponCategoryId}, </if>
+			<if test="couponUse != null">`coupon_use` = #{couponUse}, </if>
+			<if test="couponTitle != null">`coupon_title` = #{couponTitle}, </if>
+			<if test="couponIcon != null">`coupon_icon` = #{couponIcon}, </if>
+			<if test="withStationId != null">`with_station_id` = #{withStationId}, </if>
+			<if test="withAmount != null">`with_amount` = #{withAmount}, </if>
+			<if test="deductAmount != null">`deduct_amount` = #{deductAmount}, </if>
+			<if test="quato != null">`quato` = #{quato}, </if>
+			<if test="takeCount != null">`take_count` = #{takeCount}, </if>
+			<if test="usedCount != null">`used_count` = #{usedCount}, </if>
+			<if test="startTime != null">`start_time` = #{startTime}, </if>
+			<if test="endTime != null">`end_time` = #{endTime}, </if>
+			<if test="validStartTime != null">`valid_start_time` = #{validStartTime}, </if>
+			<if test="validEndTime != null">`valid_end_time` = #{validEndTime}, </if>
+			<if test="status != null">`status` = #{status}, </if>
+			<if test="createUserId != null">`create_user_id` = #{createUserId}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="updateUserId != null">`update_user_id` = #{updateUserId}, </if>
+			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+			<if test="couponVaild != null">`coupon_vaild` = #{couponVaild}</if>
+		</set>
+		where coupon_id = #{couponId}
+	</update>
 	<delete id="delete">
 		delete from tb_cf_coupon where coupon_id = #{value}
 	</delete>
@@ -193,15 +262,12 @@
 		</foreach>
 	</delete>
 
-    <!--查询用户所有有效的优惠券-->
-
 	<!--查询用户所有有效的优惠券-->
 	<select id="queryUserAvailableCoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-         select
-        t3.coupon_issuetable_id issCouponId,
+       select
+        t3.toitable_id ,
         t2.coupon_id,
 		t2.coupon_category_id,
-		t4.coupon_category_name,
 		t2.coupon_use,
 		t2.coupon_title,
 		t2.coupon_icon,
@@ -221,12 +287,9 @@
 		t2.update_user_id,
 		t2.update_time,
 		t2.coupon_vaild
-        from tb_cf_coupon t2 left join tb_cf_coupon_category t4 ON t2.coupon_category_id= t4.coupon_category_id
-				left join tb_cf_take_coupon t1 on t1.coupon_id=t2.coupon_id
-				left join tb_cf_issue_coupon t3 on t3.coupon_id=t2.coupon_id
-			  where ((t1.user_id=#{userId} and t1.enable_flag=1 )
-				or (t3.user_id=#{userId} and t3.enable_flag=1))
-				and t2.status=1 and (<![CDATA[ t2.valid_start_time<=#{nowTime}]]>  and <![CDATA[t2.valid_end_time>=#{nowTime}]]>)
+        from tb_cf_coupon t2 left join tb_cf_toicoupon t3 on t3.coupon_id=t2.coupon_id
+		where  t3.user_id=#{userId} and t3.enable_flag=1 and t2.status=1
+		and (<![CDATA[ t2.valid_start_time<=#{nowTime}]]>  and <![CDATA[t2.valid_end_time>=#{nowTime}]]>)
     </select>
 
 
@@ -237,11 +300,10 @@
 
 	<!--获取已使用的优惠券-->
 	<select id="queryUserUsedCoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-		select
-		t3.coupon_issuetable_id issCouponId,
+		 select
+        t3.toitable_id ,
         t2.coupon_id,
 		t2.coupon_category_id,
-		t4.coupon_category_name,
 		t2.coupon_use,
 		t2.coupon_title,
 		t2.coupon_icon,
@@ -261,20 +323,16 @@
 		t2.update_user_id,
 		t2.update_time,
 		t2.coupon_vaild
-        from tb_cf_coupon t2 left join tb_cf_coupon_category t4 ON t2.coupon_category_id= t4.coupon_category_id
-				left join tb_cf_take_coupon t1 on t1.coupon_id=t2.coupon_id
-				left join tb_cf_issue_coupon t3 on t3.coupon_id=t2.coupon_id
-		where (t1.user_id=#{userId} and t1.enable_flag=0)
-			or (t3.user_id=#{userId} and t3.enable_flag=0)
+        from tb_cf_coupon t2 left join tb_cf_toicoupon t3 on t3.coupon_id=t2.coupon_id
+		where  t3.user_id=#{userId} and t3.enable_flag=0
 	</select>
 
 	<!--获取已过期的优惠券-->
 	<select id="queryUserExpiredoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-		select
-		t3.coupon_issuetable_id issCouponId,
+	 select
+        t3.toitable_id ,
         t2.coupon_id,
 		t2.coupon_category_id,
-		t4.coupon_category_name,
 		t2.coupon_use,
 		t2.coupon_title,
 		t2.coupon_icon,
@@ -294,11 +352,8 @@
 		t2.update_user_id,
 		t2.update_time,
 		t2.coupon_vaild
-        from tb_cf_coupon t2 left join tb_cf_coupon_category t4 ON t2.coupon_category_id= t4.coupon_category_id
-				left join tb_cf_take_coupon t1 on t1.coupon_id=t2.coupon_id
-				left join tb_cf_issue_coupon t3 on t3.coupon_id=t2.coupon_id
-		where ((t1.user_id=#{userId}   and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t1.enable_flag=1)
-		or (t3.user_id=#{userId} and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t3.enable_flag=1))
+        from tb_cf_coupon t2 left join tb_cf_toicoupon t3 on t3.coupon_id=t2.coupon_id
+		where t3.user_id=#{userId} and  <![CDATA[ t2.valid_end_time<#{nowTime}]]> and t3.enable_flag=1
 	</select>
 
 

src/main/resources/mapper/TbCfToiCouponDao.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.diaoyun.zion.chinafrica.dao.TbCfToiCouponDao">
+
+    <resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity" id="tbCfToiCouponMap">
+        <result property="toitableId" column="toitable_id"/>
+        <result property="couponId" column="coupon_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="identification" column="identification"/>
+        <result property="enableFlag" column="enable_flag"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
+		select
+			`toitable_id`,
+			`coupon_id`,
+			`user_id`,
+			`create_time`,
+			`identification`,
+			`enable_flag`
+		from tb_cf_toicoupon
+		where toitable_id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
+		select
+    		`toitable_id`,
+    		`coupon_id`,
+    		`user_id`,
+    		`create_time`,
+    		`identification`,
+    		`enable_flag`
+		from tb_cf_toicoupon
+		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 toitable_id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from tb_cf_toicoupon
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+	<!--查询用户有效的优惠券-->
+	<select id="queryCouponByUserId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntityExtends">
+           	select
+            a.toitable_id,
+            a.coupon_id,
+            b.coupon_category_id,
+            b.coupon_title,
+            b.with_amount amount,
+            b.deduct_amount money,
+            b.valid_start_time start,
+            b.valid_end_time end,
+            a.enable_flag status,
+            a.user_id,
+            a.create_time,
+			a.identification,
+            a.enable_flag
+            from tb_cf_toicoupon a LEFT  join  tb_cf_coupon b ON a.coupon_id=b.coupon_id
+            WHERE a.user_id = #{userId} and a.enable_flag=1 and b.status=1
+
+    </select>
+	<update id="changeCoupnStatus" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
+             update  tb_cf_toicoupon t set  enable_flag = 0  where  t.user_id=#{userId} and  t.coupon_id=#{couponId}
+    </update>
+
+	<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
+		insert into tb_cf_toicoupon(
+			`toitable_id`,
+			`coupon_id`,
+			`user_id`,
+			`create_time`,
+			`identification`,
+			`enable_flag`)
+		values(
+			#{toitableId},
+			#{couponId},
+			#{userId},
+			#{createTime},
+			#{identification},
+			#{enableFlag})
+	</insert>
+	<insert id="saves" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
+		insert into tb_cf_toicoupon(
+			`toitable_id`,
+			`coupon_id`,
+			`user_id`,
+			`create_time`,
+			`identification`,
+			`enable_flag`)
+		values(
+			#{toitableId},
+			#{couponId},
+			#{userId},
+			#{createTime},
+			#{identification},
+			#{enableFlag})
+	</insert>
+	 <insert id="saveAndSubmit"  parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
+		 insert into tb_cf_toicoupon(
+			`toitable_id`,
+			`coupon_id`,
+			`user_id`,
+			`create_time`,
+			`identification`,
+			`enable_flag`)
+		values(
+			#{toitableId},
+			#{couponId},
+			#{userId},
+			#{createTime},
+			#{identification},
+			#{enableFlag})
+	 </insert>
+	<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToiCouponEntity">
+		update tb_cf_toicoupon 
+		<set>
+			<if test="couponId != null">`coupon_id` = #{couponId}, </if>
+			<if test="userId != null">`user_id` = #{userId}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="identification != null">`identification` = #{identification}, </if>
+			<if test="enableFlag != null">`enable_flag` = #{enableFlag}</if>
+		</set>
+		where toitable_id = #{toitableId}
+	</update>
+	
+	<delete id="delete">
+		delete from tb_cf_toicoupon where toitable_id = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from tb_cf_toicoupon where toitable_id in 
+		<foreach item="toitableId" collection="array" open="(" separator="," close=")">
+			#{toitableId}
+		</foreach>
+	</delete>
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/TbCfUserInfoDao.xml

@@ -53,7 +53,20 @@
 		from tb_cf_user_info
 		where user_id = #{id}
 	</select>
-
+    <!--提供给第三方的接口查询用户列表 -->
+    <select id="queryUserList" resultType="com.diaoyun.zion.chinafrica.vo.TbCfUserVo">
+        select
+         u.user_id,
+         u.user_no,
+         u.nick user_name,
+         u.phone,
+         u.last_login_time,
+         a.address_id defaultAddressId,
+		 a.address_detail defaultAddressName,
+		 u.enable_flag
+        from tb_cf_user_info u left join tb_cf_address a on u.user_id=a.user_id
+        WHERE 1=1
+    </select>
     <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity">
         select
         `user_id`,
@@ -168,7 +181,6 @@
             <if test="loginCount != null">`login_count` = #{loginCount},</if>
             <if test="email != null">`email` = #{email},</if>
             <if test="facebook != null">`facebook` = #{facebook},</if>
-
             <if test="sex != null">`sex` = #{sex},</if>
             <if test="defaultAddressId != null">`default_address_id` = #{defaultAddressId},</if>
             <if test="invitedUserId != null">`invited_user_id` = #{invitedUserId},</if>
@@ -201,6 +213,11 @@
         or email =#{account} or nick =#{account});
     </select>
 
+    <!--根据userId 账号  email 查找用户-->
+    <select id="findByEmail" resultType="com.diaoyun.zion.chinafrica.entity.TbCfUserInfoEntity">
+        select * from tb_cf_user_info where enable_flag=1 and (user_id=#{userId} or account=#{account}
+        or email =#{email} or nick =#{account});
+    </select>
     <!--修改密码-->
     <update id="updatePassWord" >
         update tb_cf_user_info set password=#{newPassword} where user_id=#{userId}

src/main/resources/templates/email-template.ftl

@@ -5,14 +5,10 @@
 </head>
 
 <body>
-    <section style="width: 600px;height :720px;background: #FFF8B3;margin:0 auto;box-sizing: border-box;padding: 20px 20px 62px 20px;">
-        <div style="width:100%;height:100%; background:#fff;border-radius: 8px;position:relative;box-shadow:0px 3px 6px rgba(250,185,5,0.25);top:-45px">
-            <img style="position:absolute;width:100%;top:0;left:0;" src="https://diaopaas.com/wk_vote_node/public/africa-email.png" alt="背景图">
-            <div style="margin-top:-45px;width: 70%;word-wrap:break-word; word-break:break-all;font-size: 16px;padding-top:243px;text-align:center;margin:0 auto;line-height: 24px;color:#272626;font-weight:400;">${nick}, Welcome to Afrishop! Before we begin</br> shopping,  we need to quickly verify</br> your email address.</div>
-            <p style="font-size:16px;font-weight:bolder;line-height:32px;color:rgba(39,38,38,1);text-align: center;margin-top:15px;">Your verification code is:</p>
-            <div style="width:150px;margin-top:-45px;height:36px;background:rgba(254,230,6,1);border-radius: 2px;margin: 0 auto;font-size:16px;font-weight:bolder;line-height:36px;color:rgba(39,38,38,1);text-align: center;">${identifyCode?c}</div>
-            <span style="font-size:12px;font-family:'SF UI  Text';font-weight:400;line-height:16px;color:rgba(210,209,207,1);opacity:1;bottom:30px;display: block;text-align: center;">By Afrishop</span>
-        </div>   
+    <section style="width: 600px;height :720px;margin:0 auto;box-sizing: border-box;position: relative;">
+        <img style="position:absolute;width: 600px;height :720px;top:0;left:0;" src="https://diaopaas.com/wk_vote_node/public/africa-email-bg.png" alt="背景图">   
+        <span style="position: absolute;top:42.1%;left:8%;display: inline-block;width:50px;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">${nick}</span>
+        <span style="text-align: center;position: absolute;top:63.3%;left:42.4%;display: inline-block;width:90px;white-space: nowrap;">${identifyCode?c}</span>
     </section>
 </body>
 </html>

src/test/java/com/diaoyun/zion/ZionApplicationTests.java

@@ -2,7 +2,6 @@ package com.diaoyun.zion;
 
 import com.diaoyun.zion.chinafrica.constant.KeyConstant;
 import com.diaoyun.zion.chinafrica.dao.TbCfIssueCouponDao;
-import com.diaoyun.zion.chinafrica.entity.TbCfIssueCouponEntity;
 import com.diaoyun.zion.chinafrica.service.SpiderService;
 import com.diaoyun.zion.chinafrica.service.TbCfCouponService;
 import com.diaoyun.zion.chinafrica.service.TbCfIssueCouponService;
@@ -10,7 +9,6 @@ import com.diaoyun.zion.chinafrica.service.TbCfUserInfoService;
 import com.diaoyun.zion.master.thread.TaskLimitSemaphore;
 import com.diaoyun.zion.master.util.AESUtils;
 import com.diaoyun.zion.master.util.IdUtil;
-import com.diaoyun.zion.master.util.SMSUtil;
 import com.stripe.exception.StripeException;
 import freemarker.template.Configuration;
 import org.apache.http.NameValuePair;
@@ -455,7 +453,7 @@ public class ZionApplicationTests {
     }
     @Autowired
     private TbCfIssueCouponService tbCfIssueCouponService;
-    @Test
+  /*  @Test
     public void testLogin(){
         TbCfIssueCouponEntity issue = new TbCfIssueCouponEntity();
         String coupon_id = "";
@@ -469,8 +467,8 @@ public class ZionApplicationTests {
         issue.setEnableFlag(0);
         tbCfIssueCouponService.save(issue);
     }
-
-    @Test
+*/
+  /*  @Test
     public void testInsert(){
         TbCfIssueCouponEntity issue = new TbCfIssueCouponEntity();
 
@@ -483,7 +481,7 @@ public class ZionApplicationTests {
         issue.setNick("都比");
         issue.setEnableFlag(1);
         tbCfIssueCouponService.save(issue);
-    }
+    }*/
     @Test
     public void testCouponStatus(){
         String userId="c45e8b04b9d44cf4b48e2d5cdb18fbcd";