Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java

@@ -54,18 +54,14 @@
   }



   @Override

   public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, Long seconds) {

      return userSystemCouponRecordMapper.getCouponByUsingTimeOut(uid, seconds);

   }



   @Override

   public boolean isSuccessMianDan(Integer source, String orderId) {

      List<String> orderList = new ArrayList<>();

      orderList.add(orderId);

      List<UserSystemCouponRecord> list = getRecordByOrderNoList(source, orderList);

      for (UserSystemCouponRecord record : list) {

         if (record.getCouponType().equalsIgnoreCase(CouponTypeEnum.freeCoupon.name())

               || record.getCouponType().equalsIgnoreCase(CouponTypeEnum.welfareFreeCoupon.name())) {

               || record.getCouponType().equalsIgnoreCase(CouponTypeEnum.welfareFreeCoupon.name())

               || record.getCouponType().equalsIgnoreCase(CouponTypeEnum.freeCouponBuy.name())) {

            if (record.getState() == UserSystemCouponRecord.STATE_FREE_ON

                  || record.getState() == UserSystemCouponRecord.STATE_SUCCESS)

               return true;

@@ -74,4 +70,8 @@
      return false;

   }



   @Override

   public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId) {

      return userSystemCouponRecordMapper.getNearByUserCouponId(userCouponId);

   }

}