fanli-server.git

			@@ -117,8 +117,8 @@
			throw new TokenRecordException(1, "口令不存在");

			Long uidToken = rokenRecord.getUid();
			// if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())
			// throw new TokenRecordException(1, "不能自己赠送给自己");
			if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())
			throw new TokenRecordException(1, "不能自己赠送给自己");

			Date now = new Date();
			Date endTimeToken = rokenRecord.getEndTime();
			@@ -289,9 +289,9 @@
			if (rokenRecord == null)
			throw new TokenRecordException(1, "口令已失效");

			// Long uidToken = rokenRecord.getUid();
			// if (uidToken != null && uid.longValue() == uidToken.longValue())
			// throw new TokenRecordException(1, "不能自己赠送给自己");
			Long uidToken = rokenRecord.getUid();
			if (uidToken != null && uid.longValue() == uidToken.longValue())
			throw new TokenRecordException(1, "不能自己赠送给自己");

			Date now = new Date();
			Date endTimeToken = rokenRecord.getEndTime();

			@@ -1874,7 +1874,9 @@
			}
			}
			}
			} else if (give && UserSystemCoupon.STATE_END_USE == state) {
			} else if (UserSystemCoupon.STATE_END_USE == state) {

			if (give) {
			userCouponVO.setCouponRule(systemCoupon.getRemark());
			if (CouponTypeEnum.freeCouponGive == type) {
			userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
			@@ -1888,14 +1890,24 @@
			if (useTime != null) {
			Map<String, Object> remainDays = new HashMap<String, Object>();
			remainDays.put("content", "于" + sdf.format(useTime) + "成功赠送");
			remainDays.put("fontColor", "#999999");
			remainDays.put("fontColor", "#CCCCCC");
			userCouponVO.setRemainDays(remainDays);
			}
			} else {
			Date useTime = userCouponVO.getUseTime();
			if (useTime != null) {
			Map<String, Object> remainDays = new HashMap<String, Object>();
			remainDays.put("content", "于" + sdf.format(useTime) + "成功使用");
			remainDays.put("fontColor", "#CCCCCC");
			userCouponVO.setRemainDays(remainDays);
			}
			}

			}else if (UserSystemCoupon.STATE_OVERDUE == state) {
			if (endTime != null) {
			Map<String, Object> remainDays = new HashMap<String, Object>();
			remainDays.put("content", "于" + sdf.format(endTime) + "过期");
			remainDays.put("fontColor", "#999999");
			remainDays.put("fontColor", "#CCCCCC");
			userCouponVO.setRemainDays(remainDays);
			}

	fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史