From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index 4101586..2217c7d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -167,15 +167,14 @@
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
data.put("helpUrl", configService.get("order_list_help"));
- data.put("validMoney", validMoney);
- data.put("invalidMoney", invalidMoney);
+ data.put("validMoney", "楼" + validMoney);
+ data.put("invalidMoney", "楼" + invalidMoney);
data.put("findOrderHelpUrl", orderFindUrl);
out.print(JsonUtil.loadTrueResult(data));
} catch (CommonOrderException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
- e.printStackTrace();
LogHelper.errorDetailInfo(e);
}
}
@@ -228,11 +227,11 @@
*/
@RequestMapping(value = "getOrderCount", method = RequestMethod.POST)
public void getOrderCount(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {
- if (uid == null || type == null) {
+ if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "璇锋眰鍙傛暟涓嶆纭�"));
return;
}
-
+
try {
UserInfo user = userInfoService.selectByPKey(uid);
if (user == null) {
@@ -248,9 +247,9 @@
}
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
-
- if (type == 0) {
- OrderCountVO total = commonOrderService.getOrderCount(uid, 1, type);
+
+ if (type == null || type == 0) {
+ OrderCountVO total = commonOrderService.getOrderCount(uid, null, type);
data.put("total", total.getSelf() + total.getShared() + total.getInvite());
data.put("self", total.getSelf());
data.put("shared", total.getShared());
--
Gitblit v1.8.0