From 646196c8b6f46b1156189f0d3a16fb6c5200c789 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 五月 2020 09:48:44 +0800
Subject: [PATCH] 队员排行榜bug
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
index 8f9dacf..62627ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
@@ -245,12 +245,12 @@
String invalidMoney = "0.00";
if (page == 1) {
BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
- orderNo, state, startTime, endTime, listSource);
+ orderNo, state, startTime, endTime, listSource,false);
if (predictMoney != null)
validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
- orderNo, state, startTime, endTime, listSource);
+ orderNo, state, startTime, endTime, listSource,false);
if (postSaleMoney != null)
invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
@@ -313,7 +313,11 @@
List<ESOrder> listES = esOrderService.query(key, uid.toString(), listSource);
if (listES.size() != 0) {
- list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
+ // 2.1鐗堟湰
+ AcceptData acceptData = new AcceptData();
+ acceptData.setPlatform("android");
+ acceptData.setVersion("56");
+ list = commonOrderService.searchOrderByUid(acceptData, page, Constant.PAGE_SIZE, uid, listES);
count = commonOrderService.countSearchOrderByUid(uid, listES);
}
--
Gitblit v1.8.0