From 484fbd1d5372cc849be003c9c3f7482d6561ad00 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 十二月 2018 10:37:11 +0800
Subject: [PATCH] 资金校验修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 50 ++++++++++++++------------------------------------
1 files changed, 14 insertions(+), 36 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..5477b87 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
@@ -15,11 +15,12 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.IPUtil;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -34,6 +35,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
+import com.yeshi.fanli.exception.ExtractException;
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.log.LogHelper;
@@ -55,9 +57,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import org.yeshi.utils.DateUtil;
-import org.yeshi.utils.IPUtil;
-import org.yeshi.utils.JsonUtil;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/extract")
@@ -328,27 +328,12 @@
*/
@RequestMapping(value = "checkExtract", method = RequestMethod.POST)
public void checkExtract(String uid, PrintWriter out) {
-
JSONObject data = new JSONObject();
-
- // 宸插埌璐︾殑绾㈠寘
- int count = hongBaoService.getCount(HongBao.STATE_YILINGQU);
- if (count == 0) {
- data.put("code", "1");
- out.print(data);
- return;
- }
-
- List<Integer> checked = extractService.checkExtract(uid);
- if (checked != null && checked.size() > 0) {
- Integer diversity = checked.get(0);
- if (diversity == 0) {
- data.put("code", "0");
- } else {
- data.put("code", "1");
- }
- } else {
- data.put("code", "1");
+ try {
+ extractService.checkExtract(uid);
+ data.put("code", "1"); // 姝ｅ父
+ } catch (ExtractException e) {
+ data.put("code", "0");// 寮傚父
}
out.print(data);
}
@@ -1401,18 +1386,11 @@
return;
}
- List<Integer> listChecked = extractService.checkExtract(uid);
-
- if (listChecked == null || listChecked.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璧勯噾寮傚父"));
- return;
- }
-
- Integer diversity = listChecked.get(0);
- if (diversity == 0) {
+ try {
+ extractService.checkExtract(uid);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝ｅ父"));
- } else {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璧勯噾寮傚父"));
+ } catch (ExtractException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
}
}
--
Gitblit v1.8.0