From 4d6d0dfe586077c44e70318d5500cf35b92b0d49 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 04 十二月 2018 18:15:12 +0800
Subject: [PATCH] Merge branch 'dev1'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index aa1b49e..a565421 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -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("璧勯噾姝ｅ父"));
}
+
}
}
--
Gitblit v1.8.0