Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

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

@@ -254,7 +254,7 @@
      int num = 0;

      FrequencyEnum frequency = integralTask.getFrequency();

      if (frequency == FrequencyEnum.everyday) {

         num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, record.getCreateTime());

         num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, TimeUtil.getWholeTime(record.getCreateTime().getTime()));

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

         num = 1;

      }