修复注册问题

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

@@ -97,15 +97,6 @@ public class TbCfUserInfoEntity implements Serializable {
      * 邮箱验证 0未验证，1已验证
      */
     private Integer emailFlag;
-    private String  couponId;
-
-    public String getCouponId() {
-        return couponId;
-    }
-
-    public void setCouponId(String couponId) {
-        this.couponId = couponId;
-    }
 
     /**
      * 设置：用户id

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

@@ -154,10 +154,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
                 String password = passwordEncoder.encode(tbCfUserInfoVo.getPassword());
                 tbCfUserInfoVo.setPassword(password);
                 BeanUtils.copyProperties(tbCfUserInfoVo, tbCfUserInfoEntity);
-                //赠送用户优惠券
-                String couponId=tbCfCouponDao.getCouponId();
-                tbCfUserInfoVo.setCouponId(couponId);
                 tbCfUserInfoDao.save(tbCfUserInfoEntity);
+                //赠送用户优惠券
 
                 //注册成功 创建token
                 String token = jwtTokenProvider.createToken(tbCfUserInfoVo.getAccount());
@@ -167,11 +165,18 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
                 result.setMessage(ResultCodeEnum.SUCCESS.getDesc());
                 result.setData(tbCfUserInfoVo);
 
+                //获取购物返券
+                List<TbCfCouponEntity> couponList = tbCfCouponDao.getCouponByCategory(CouponCategoryEnum.REGISTER.getValue(),new Date());
+                if(!couponList.isEmpty()) {
+                    //领取优惠券
+                    tbCfCouponService.takeCoupon(couponList.get(0).getCouponId(),tbCfUserInfoVo.getUserId());
+                }
             } else {
                 result.setCode(ResultCodeEnum.VALIDATE_ERROR.getCode());
                 result.setMessage("The mailbox or nick has been registered");
             }
             tbCfUserInfoVo.setEnableFlag(StateConstant.VALID);
+
         }
         return result;
     }

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

@@ -135,17 +135,6 @@ public class TbCfUserInfoVo implements Serializable {
     @ApiModelProperty(value="用户token")
     private String token;
 
-    @ApiModelProperty(value="优惠券id")
-    private String couponId;
-
-    public String getCouponId() {
-        return couponId;
-    }
-
-    public void setCouponId(String couponId) {
-        this.couponId = couponId;
-    }
-
     /**
      * 设置：用户id
      */

src/main/resources/mapper/TbCfCouponDao.xml

@@ -205,7 +205,7 @@
 		select t2.* from tb_cf_take_coupon t1,tb_cf_coupon t2 ,tb_cf_issue_coupon t3  ,tb_cf_user_info t4
 		where (t1.user_id=#{userId} and t1.coupon_id=t2.coupon_id and t2.coupon_id=t3.coupon_id)
         and t1.enable_flag=0 and t3.enable_flag=0
-	</select> 
+	</select>
 	<!--获取已过期的优惠券-->
 	<select id="queryUserExpiredoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
 		select t2.* from tb_cf_take_coupon t1,tb_cf_coupon t2 ,tb_cf_issue_coupon t3 where t1.user_id=#{userId} and t1.coupon_id=t2.coupon_id and t1.coupon_id=t2.coupon_id and t2.coupon_id=t3.coupon_id