From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 e1ed4eb..4eebe85 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
@@ -420,19 +420,19 @@
* 璇ョ敤鎴烽個璇疯繘搴�
*
* @param acceptData
- * @param uid 涓嬬嚎UID
+ * @param tid 涓嬬嚎UID
* @param out
*/
@RequestMapping(value = "getInviteProgress")
- public void getInviteProgress(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
- if (uid == null || uid <= 0) {
+ 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));
- data.put("num", threeSaleSerivce.getTeamOrderNumByWorkerId(uid));
+ 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 {
@@ -470,6 +470,7 @@
continue;
RedPackWinProgressVO progressVO = new RedPackWinProgressVO();
+ progressVO.setUid(userInfo.getId());
progressVO.setName(userInfo.getNickName());
progressVO.setPortrait(userInfo.getPortrait());
progressVO.setMoney(win.getMoney().setScale(2).toString());
--
Gitblit v1.8.0