From 6525d6dd483ec67d0d187c3cace7ab82accb341a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 27 十二月 2018 09:27:23 +0800
Subject: [PATCH] 订单接口调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 b1fa29a..cce41df 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
@@ -93,11 +93,12 @@
try {
long count = 0;
- List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState, orderNo,
- startTime, endTime, dateType);
+ List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,
+ orderNo, startTime, endTime, dateType);
if (list != null && list.size() > 0) {
- count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime, endTime, dateType);
+ count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo,
+ startTime, endTime, dateType);
}
int totalValid = 0;
@@ -107,7 +108,8 @@
BigDecimal todayMoney = null;
// 闇�瑕佺粺璁′俊鎭�
if (needCount && page == 1) {
- Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, startTime, endTime);
+ Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
+ startTime, endTime, dateType);
if (countOrder.get("totalValid") != null) {
totalValid = countOrder.get("totalValid").intValue();
@@ -137,8 +139,12 @@
data.put("helpUrl", helpUrl);
- data.put("todayTotal", todayTotal);
- data.put("todayMoney", todayMoney);
+ if (type != null && type == 1) {
+ data.put("todayMoney", "浠婃棩棰勪及杩斿埄鎬婚 楼" + todayMoney);
+ } else {
+ data.put("todayMoney", "棰勪及濂栭噾鎬婚 楼" + todayMoney);
+ }
+ data.put("todayTotal", "鍏�"+ todayTotal+ "绗�");
data.put("totalValid", totalValid); // 鏈夋晥鏁伴噺
data.put("totalProces", totalProces); // 缁存潈鏁伴噺
data.put("totalInvite", totalInvite); // 澶辨晥鏁伴噺
--
Gitblit v1.8.0