From 051e1e78cd217d14ca34c26afe485b6c9c85c01d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 12 九月 2019 16:42:04 +0800
Subject: [PATCH] 订单调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index b1b4406..3f08f32 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -152,6 +152,12 @@
type = null; // 鎵�鏈夌被鍨嬭鍗�
}
+ Integer tempState = state;
+ // 杞崲鐘舵��
+ if (state != null && orderState != null && (orderState == 2|| orderState == 3)) {
+ state = null; // 娓呯┖
+ }
+
if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
} else if (goodsType != null && goodsType == 0){
@@ -174,9 +180,9 @@
try {
long count = 0;
- int totalValid = 0;
- int totalProces = 0;
- int totalInvite = 0;
+ long totalValid = 0;
+ long totalProces = 0;
+ long totalInvite = 0;
long todayTotal = 0;
BigDecimal todayMoney = null;
@@ -197,21 +203,17 @@
todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime, goodsType);
- // 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
- Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, startTime,
- endTime, dateType, goodsType);
-
- if (countOrder.get("totalValid") != null) {
- totalValid = countOrder.get("totalValid").intValue();
- }
-
- if (countOrder.get("totalProces") != null) {
- totalProces = countOrder.get("totalProces").intValue();
- }
-
- if (countOrder.get("totalInvite") != null) {
- totalInvite = countOrder.get("totalInvite").intValue();
- }
+ // 鏈夋晥璁㈠崟
+ totalValid = commonOrderService.countUserOrderToApp(uid, type, startTime,
+ endTime, dateType, goodsType, tempState, 1);
+
+ // 缁存潈璁㈠崟
+ totalProces = commonOrderService.countUserOrderToApp(uid, type, startTime,
+ endTime, dateType, goodsType, null, 2);
+
+ // 澶辨晥璁㈠崟
+ totalInvite = commonOrderService.countUserOrderToApp(uid, type, startTime,
+ endTime, dateType, goodsType, null, 3);
}
if (todayMoney == null) {
--
Gitblit v1.8.0