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

yujian

2019-12-07 1fd8f11537bb74c1f7e611e35a766cbbd34eff05

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java

@@ -28,6 +28,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.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -76,6 +77,8 @@
   @Resource

   private UserLotteryRecordService userLotteryRecordService;

   

   @Resource

   private UserVIPInfoService userVIPInfoService;



   /**

    * 用户券列表查询

@@ -110,7 +113,7 @@
   

         long count = UserSystemCouponService.countUserCouponList(uid);

         

         List<UserSystemCouponVO> resultList = UserSystemCouponService.getCouponList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);

         List<UserSystemCouponVO> resultList = UserSystemCouponService.getCouponList(acceptData,(page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid);

         if (resultList == null) {

            resultList = new ArrayList<UserSystemCouponVO>();

         }

@@ -185,12 +188,15 @@
    */

   @RequestMapping(value = "getOrderCouponList", method = RequestMethod.POST)

   public void getOrderCouponList(AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {



      if (uid == null || StringUtil.isNullOrEmpty(orderNo)) {

         out.print(JsonUtil.loadFalseResult("传递参数信息不完整"));

         return;

      }

      

      if (userVIPInfoService.isVIP(uid)) {

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

         return;

      }

      

      List<CommonOrder> listOrder = commonOrderService.getByOrderNo(uid, orderNo);

      if (listOrder == null || listOrder.size() == 0) {