fanli-server.git

			@@ -255,10 +255,11 @@
			if (UniqueKeyEnum.dailySign == taskClass.getUniqueKey()) {
			SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
			Date recordTime = record.getCreateTime();
			List<IntegralTaskRecord> list = integralTaskRecordMapper.listSignRecordByDateTime(uid, cid, format.format(recordTime));
			List<IntegralTaskRecord> list = integralTaskRecordMapper.listSignRecordByDateTime(uid, cid,
			format.format(recordTime));
			int num = 1;
			if (list != null && list.size() > 0) {
			try {
			try {
			Date nextDate = null;
			for (IntegralTaskRecord tntegralTaskRecord : list) {
			if (nextDate == null) {
			@@ -281,17 +282,18 @@
			int num = 0;
			FrequencyEnum frequency = integralTask.getFrequency();
			if (frequency == FrequencyEnum.everyday) {
			num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, TimeUtil.getWholeTime(record.getCreateTime().getTime()));
			num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,
			TimeUtil.getWholeTime(record.getCreateTime().getTime()));
			} else if (frequency == FrequencyEnum.onlyOne) {
			num = 1;
			}


			if (num <= 0)
			num = 1;
			String title = taskClass.getName() + "-" + integralTask.getName() + "-" + num + "次";
			detail.setTitle(title);
			}


			detail.setUid(uid);
			detail.setMoney(record.getGoldCoin());
			detail.setCreateTime(record.getCreateTime());
			@@ -301,12 +303,17 @@
			}

			@Override
			public Integer countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {
			if (day == null)
			return null;
			Date minTime = new Date(
			TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(day.getTime(), "yyyy-MM-dd"), "yyyy-MM-dd"));
			Date maxTime = new Date(minTime.getTime() + 1000 * 60 * 60 * 24L);
			public int countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {
			Date minTime = null;
			Date maxTime = null;
			if (day == null) {
			minTime = new Date(TimeUtil.convertToTimeTemp("1970-01-01", "yyyy-MM-dd"));
			maxTime = new Date(TimeUtil.convertToTimeTemp("2100-01-01", "yyyy-MM-dd"));
			} else {
			minTime = new Date(
			TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(day.getTime(), "yyyy-MM-dd"), "yyyy-MM-dd"));
			maxTime = new Date(minTime.getTime() + 1000 * 60 * 60 * 24L);
			}
			return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);
			}

			@@ -327,4 +334,21 @@
			integralTaskRecordMapper.insertSelective(record);
			return record;
			}

			@Override
			public List<IntegralTaskRecord> listByCidAndUidAndCreateTime(Long cid, Long uid, Date minTime, Date maxTime,
			int page, int count) {
			return integralTaskRecordMapper.listByCidAndUidAndCreateTime(cid, uid, minTime, maxTime, (page - 1) * count,
			count);
			}

			@Override
			public long countByCidAndUidAndCreateTime(Long cid, Long uid, Date minTime, Date maxTime) {
			return integralTaskRecordMapper.countByCidAndUidAndCreateTime(cid, uid, minTime, maxTime);
			}

			@Override
			public List<IntegralTaskRecord> listByUidAndTaskId(Long uid, Long taskId, int page, int count) {
			return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
			}
			}