fanli-server.git

			@@ -63,6 +63,16 @@
			recommendActivity.setInviteInfo(info);
			}

			if (recommendActivity !=null) {
			ActivityUser activityUser = recommendActivity.getActivityUser();
			if (activityUser != null) {
			ActivityUser resultUser = activityService.selectActivityUserByPrimaryKey(activityUser.getId());
			if (resultUser != null) {
			recommendActivity.setActivityUser(resultUser);
			}
			}
			}

			if (StringUtil.isNullOrEmpty(callback)) {
			out.print(JsonUtil.loadTrueResult(recommendActivity));
			} else {

			@@ -334,7 +334,7 @@
			// 已到账的红包
			int count = hongBaoService.getCount(HongBao.STATE_YILINGQU);
			if (count == 0) {
			data.put("code", "1");
			data.put("code", "0"); //异常
			out.print(data);
			return;
			}
			@@ -343,12 +343,12 @@
			if (checked != null && checked.size() > 0) {
			Integer diversity = checked.get(0);
			if (diversity == 0) {
			data.put("code", "0");
			data.put("code", "0");// 异常
			} else {
			data.put("code", "1");
			data.put("code", "1"); // 正常
			}
			} else {
			data.put("code", "1");
			data.put("code", "1"); //正常
			}
			out.print(data);
			}
			@@ -1401,19 +1401,26 @@
			return;
			}

			List<Integer> listChecked = extractService.checkExtract(uid);

			if (listChecked == null \|\| listChecked.size() == 0) {
			// 已到账的红包
			int count = hongBaoService.getCount(HongBao.STATE_YILINGQU);
			if (count == 0) {
			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("资金异常"));
			return;
			}

			List<Integer> listChecked = extractService.checkExtract(uid);
			if (listChecked == null \|\| listChecked.size() == 0) {
			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资金正常"));
			return;
			}

			Integer diversity = listChecked.get(0);
			if (diversity == 0) {
			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资金正常"));
			} else {
			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("资金异常"));
			} else {
			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("资金正常"));
			}

			}

			}

			@@ -617,4 +617,9 @@
			public int updateByPrimaryKey(RecommendActivity record) {
			return recommendActivityMapper.updateByPrimaryKey(record);
			}

			@Override
			public ActivityUser selectActivityUserByPrimaryKey(Long id) {
			return activityUserMapper.selectByPrimaryKey(id);
			}
			}

			@@ -235,4 +235,5 @@

			public RecommendActivity getRecommendActivityDetail(Long activityId);

			public ActivityUser selectActivityUserByPrimaryKey(Long id);
			}

	fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/inter/activity/ActivityService.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史