Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java

@@ -31,6 +31,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;

import com.yeshi.fanli.vo.user.UserSystemCouponVO;

@@ -78,7 +79,8 @@
   @Resource

   private UserLotteryRecordService userLotteryRecordService;

   



   @Resource

   private UserVIPInfoService userVIPInfoService;



   /**

    * 用户券列表查询

@@ -289,6 +291,11 @@
         return;

      }



      if (userVIPInfoService.isVIP(uid)) {

         out.print(JsonUtil.loadFalseResult("超级会员不可使用奖励券"));

         return;

      }

		
      if (goodsType == null || goodsType > 3 || goodsType < 1) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      }