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/service/impl/user/UserSystemCouponServiceImpl.java

@@ -253,6 +253,8 @@
         } else {

            coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);

         }

      } else if (couponType.equals(CouponTypeEnum.freeCouponGive.name())) {

         coupon = systemCouponService.getCouponByType(couponType);

      }



      if (coupon == null) {

@@ -2452,34 +2454,16 @@
   }



   @Override

   public boolean getIncludeExchange(Long uid) {

   public boolean getValidRebateCoupon(Long uid) {

      // 过期券

      updateInvalidSate(uid);



      String percent = configService.get("exchange_rebate_percent");

      if (StringUtil.isNullOrEmpty(percent))

         percent = "35";

      List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, Integer.parseInt(percent),

            CouponTypeEnum.rebatePercentCoupon.name());

		
      List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());

      if (listCoupon == null || listCoupon.size() == 0)

         return false;

      return true;

   }



   @Override

   public boolean getIncludeNotExchange(Long uid) {

      // 过期券

      updateInvalidSate(uid);



      String percent = configService.get("exchange_rebate_percent");

      if (StringUtil.isNullOrEmpty(percent))

         percent = "35";

      List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid,

            Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());

      if (listCoupon == null || listCoupon.size() == 0)

         return false;

      return true;

   }



   @Override

   public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception {

@@ -2489,12 +2473,8 @@
      // 退回券

      sendBackTimeOutCoupon(uid);



      String percent = configService.get("exchange_rebate_percent");

      if (StringUtil.isNullOrEmpty(percent))

         percent = "35";



      List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid,

            Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());

      List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());

      if (listCoupon == null || listCoupon.size() == 0)

         return null;