From acd2b6eaf5ebd1a9d5aa1f54a741dfa6fc52ac10 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 27 十一月 2018 17:51:01 +0800
Subject: [PATCH] Merge branch 'dev1'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 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 e2f7a25..6ba3a56 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
@@ -54,6 +54,7 @@
import com.yeshi.fanli.util.StringUtil;
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;
@@ -896,7 +897,6 @@
// 鍗曠瑪鏀剁泭閲戦
BigDecimal money = hongBao.getMoney();
- BigDecimal payMoney = hongBao.getPayMoney();
map.put("getTime",getTime);
@@ -909,13 +909,31 @@
/* 璁㈠崟鐘舵�佸垽鏂細1 璁㈠崟宸蹭粯娆� 2銆佽鍗曞凡缁撶畻 4銆佽鍗曞け鏁� */
if (state == HongBao.STATE_SHIXIAO) {
map.put("orderState",4); // 璁㈠崟澶辨晥
- } else if (state == HongBao.STATE_BUKELINGQU || state == HongBao.STATE_KELINGQU) {
- if (preGettime != null && preGettime > 0) {
- map.put("orderState",2); // 璁㈠崟缁撶畻
+ } else if (state == HongBao.STATE_BUKELINGQU) {
+ Integer orderState = null;
+
+ if (type == HongBao.TYPE_SHARE_GOODS) {
+ // 鍒嗕韩璁㈠崟
+ Long hongbaoId = hongBao.getId();
+ PidOrder pidOrder = pidOrderService.getPidOrderByHongBaoId(hongbaoId);
+ String pidstate = pidOrder.getState();
+ if ("璁㈠崟浠樻".equals(pidstate)) {
+ orderState = 1;
+ } else if ("璁㈠崟缁撶畻".equals(pidstate)) {
+ orderState = 2;
+ } else if ("璁㈠崟澶辨晥".equals(pidstate)) {
+ orderState = 4;
+ }
} else {
- map.put("orderState",1); // 璁㈠崟宸蹭粯娆�
+ if (preGettime != null && preGettime > 0) {
+ orderState = 2; // 璁㈠崟缁撶畻
+ } else {
+ orderState = 1; // 璁㈠崟宸蹭粯娆�
+ }
}
- } else {
+ map.put("orderState",orderState);
+
+ } else if (state == HongBao.STATE_KELINGQU || state == HongBao.STATE_YILINGQU) {
map.put("orderState",2); // 璁㈠崟缁撶畻
}
@@ -1411,4 +1429,34 @@
}
+
+ /**
+ * 鏍￠獙鐢ㄦ埛璧勯噾鏄惁寮傚父
+ *
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "checkMoney")
+ public void checkMoney(String callback, String uid, PrintWriter out) {
+
+ if (StringUtil.isNullOrEmpty(uid)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("UID涓嶈兘涓虹┖"));
+ 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) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勯噾姝ｅ父"));
+ } else {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璧勯噾寮傚父"));
+ }
+ }
+
}
--
Gitblit v1.8.0