修复注册登录昵称设为头像地址，修复一个用户只能拥有一种优惠券。

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

@@ -15,5 +15,7 @@ import java.util.List;
 public interface TbCfIssueCouponDao extends BaseDao<TbCfIssueCouponEntity> {
 
     List<TbCfIssueCouponEntityExtends> queryCouponByUserId(String userId);
+
     int changeCouponStatus(String userId,String couponId);
+
 }

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

@@ -510,7 +510,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
      * @param couponId
      */
     private void couponUse(String userId, String couponId) {
-
         //更新领取记录已领取
         int res = tbCfTakeCouponDao.updateEnableFlag(userId, couponId, StateConstant.INVALID);
         if (res < 1) {

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

@@ -161,8 +161,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
                 String userid = IdUtil.createIdbyUUID();
                 tbCfUserInfoVo.setUserId(userid);
                 //用户姓名
-                String avatar = domainProperties.getProperty("user.avatar");
-                tbCfUserInfoVo.setAvatar(avatar);
+                String nick = domainProperties.getProperty("user.nick");
+                tbCfUserInfoVo.setNick(nick);
                 fillUserNecessayInfo(tbCfUserInfoVo);
                 //加密密码
                 String password = passwordEncoder.encode(tbCfUserInfoVo.getPassword());
@@ -183,7 +183,7 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
                     issue.setCouponIssuetableId(issuseCoupon_id);
                     issue.setCreateTime(date);
                     issue.setUserId(userid);
-                    issue.setNick(avatar);
+                    issue.setNick(nick);
                     issue.setEnableFlag(0);
                     tbCfIssueCouponService.save(issue);
                 }
@@ -474,6 +474,7 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
         }
     }*/
     private void fillUserNecessayInfo(TbCfUserInfoVo tbCfUserInfoVo) {
+        tbCfUserInfoVo.setAvatar(domainProperties.getProperty("user.avatar"));
         tbCfUserInfoVo.setUserNo(IdUtil.createIdByDate());
         tbCfUserInfoVo.setPhoneFlag(StateConstant.INVALID);
         tbCfUserInfoVo.setLoginCount(0);

src/main/resources/mapper/TbCfCouponDao.xml

@@ -196,7 +196,7 @@
 
 	<!--查询用户所有有效的优惠券-->
 	<select id="queryUserAvailableCoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-         select DISTINCT
+         select
         t2.coupon_id,
 		t2.coupon_category_id,
 		t4.coupon_category_name,
@@ -235,7 +235,7 @@
 
 	<!--获取已使用的优惠券-->
 	<select id="queryUserUsedCoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-		select DISTINCT
+		select
         t2.coupon_id,
 		t2.coupon_category_id,
 		t4.coupon_category_name,
@@ -267,7 +267,7 @@
 
 	<!--获取已过期的优惠券-->
 	<select id="queryUserExpiredoupon" resultType="com.diaoyun.zion.chinafrica.entity.TbCfCouponEntity">
-		select DISTINCT
+		select
         t2.coupon_id,
 		t2.coupon_category_id,
 		t4.coupon_category_name,