统计可用的免单券数量-countUsableFreeCouponForBuy

yujian

2019-09-03 972d3bc71115ec977dccf835fbcd148da3bcc86c

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java

@@ -209,7 +209,12 @@
         IntegralTaskRecord record = integralTaskRecordMapper.selectByPrimaryKey(id);

         if (record == null)

            continue;



			
         // 已领取

         Integer state = record.getState();

         if (state != null && state == 1) 
            continue;

			
         if (addDetail(uid, record))

            totalGoldCoin += record.getGoldCoin();

      }

@@ -291,19 +296,18 @@
         }

         detail.setTitle(taskClass.getName() + "-第" + num + "天");

      } else {

         int num = 0;

         FrequencyEnum frequency = integralTask.getFrequency();

         if (frequency == FrequencyEnum.everyday) {

            num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,

            int num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,

                  TimeUtil.getWholeTime(record.getCreateTime().getTime()));

            if (num <= 0)

               num = 1;

            String title = taskClass.getName() + "-" + integralTask.getName() + "-第" + num + "次";

            detail.setTitle(title);

         } else if (frequency == FrequencyEnum.onlyOne) {

            num = 1;

            String title = taskClass.getName() + "-" + integralTask.getName();

            detail.setTitle(title);

         }



         if (num <= 0)

            num = 1;

         String title = taskClass.getName() + "-" + integralTask.getName() + "-第" + num + "次";

         detail.setTitle(title);

      }



      detail.setUid(uid);