admin
2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
@@ -66,7 +66,7 @@
         Long id = exchange.getId();
         if (type == ExchangeTypeEnum.freeCouponBuy) {
            // 注:因自购免单券,一个用户只能兑换一次,则当前用户一旦兑换成功,自购免单券兑换入口永久在当前用户金币兑换列表中消失。
            long num = integralExchangeRecordMapper.countRecordByUid(id, uid);
            long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null);
            if (num >= 1) {
               listValid.remove(i);
               i --;
@@ -99,8 +99,18 @@
         if (StringUtil.isNullOrEmpty(progress))
            continue;
         
         // 自购免单券-只能兑换一次
         if (type == ExchangeTypeEnum.freeCouponBuy) {
            long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null);
            if  (num >= 1) {
               listValid.remove(i);
               i --;
               continue;
            }
         }
         // 今日兑换情况
         long num = integralExchangeRecordMapper.countRecordByUid(id, uid);
         long num = integralExchangeRecordMapper.countRecordByUid(id, uid, 1);
         Integer upperLimit = exchange.getUpperLimit();
         if (upperLimit == null) {
            progress = progress.replace("{已兑换}", num + "").replace("/{上限数}", "");
@@ -113,8 +123,8 @@
   }
   
   @Override
   public long countRecordByUid(long exchangeid, Long uid){
      return integralExchangeRecordMapper.countRecordByUid(exchangeid, uid);
   public long countRecordByUid(long exchangeid, Long uid, Integer today){
      return integralExchangeRecordMapper.countRecordByUid(exchangeid, uid, today);
   }
   
   @Override