From baacd1378b33c4a84ee7a4998fb08fd9979ee4e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 09 一月 2019 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
index bafa41c..c330a9a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -307,10 +307,13 @@
JSONObject data = new JSONObject();
// 鍒嗕韩缁熻
BigDecimal sharemoney = commonOrderService.countOrderMoney(uid,2, dateType);
+
data.put("shareCount", commonOrderService.countOrder(uid, 2, dateType));
data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+
// 閭�璇风粺璁�
BigDecimal inviteMoney = commonOrderService.countOrderMoney(uid,3, dateType);
+
data.put("inviteCount", commonOrderService.countOrder(uid, 3, dateType));
data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
--
Gitblit v1.8.0