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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

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

@@ -49,8 +49,8 @@
   }



   @Override

   public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list) {

      return userSystemCouponRecordMapper.getRecordByOrderNoList(list);

   public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list) {

      return userSystemCouponRecordMapper.getRecordByOrderNoList(source, list);

   }



   @Override

@@ -59,10 +59,10 @@
   }



   @Override

   public boolean isSuccessMianDan(String orderId) {

   public boolean isSuccessMianDan(Integer source, String orderId) {

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

      orderList.add(orderId);

      List<UserSystemCouponRecord> list = getRecordByOrderNoList(orderList);

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

      for (UserSystemCouponRecord record : list) {

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

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

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

   }



   @Override

   public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId) {

      return userSystemCouponRecordMapper.getNearByUserCouponId(userCouponId);

   }

}