From 84ab5704aee0df06d0352ab67d1fa671ac284c8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 18 十二月 2019 10:06:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
index 4eebe85..026a038 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java
@@ -416,29 +416,6 @@
}
- /**
- * 璇ョ敤鎴烽個璇疯繘搴�
- *
- * @param acceptData
- * @param tid 涓嬬嚎UID
- * @param out
- */
- @RequestMapping(value = "getInviteProgress")
- public void getInviteProgress(AcceptData acceptData, Long uid, Long tid, String callback, PrintWriter out) {
- if (uid == null || uid <= 0 || tid == null || tid <= 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "浼犻�掑弬鏁扮己澶�"));
- return;
- }
-
- JSONObject data = new JSONObject();
- data.put("list", redPackWinInviteService.getInviteProgressByWorkerId(uid, tid));
- data.put("num", threeSaleSerivce.getTeamOrderNumByWorkerId(tid));
- if (!StringUtil.isNullOrEmpty(callback)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
- } else {
- out.print(JsonUtil.loadTrueResult(data));
- }
- }
/**
* 璇ョ敤鎴烽個璇峰閲戞
@@ -488,4 +465,29 @@
out.print(JsonUtil.loadTrueResult(data));
}
}
+
+
+ /**
+ * 璇ョ敤鎴烽個璇疯繘搴�
+ *
+ * @param acceptData
+ * @param tid 涓嬬嚎UID
+ * @param out
+ */
+ @RequestMapping(value = "getInviteProgress")
+ public void getInviteProgress(AcceptData acceptData, Long uid, Long tid, String callback, PrintWriter out) {
+ if (uid == null || uid <= 0 || tid == null || tid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "浼犻�掑弬鏁扮己澶�"));
+ return;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("list", redPackWinInviteService.getInviteProgressByWorkerId(uid, tid));
+ data.put("num", redPackWinInviteService.countTeamNumByTid(uid, tid));
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+ }
}
--
Gitblit v1.8.0