From ec60e757d358636dcac1589c44a66f3e276fe58c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 14:41:42 +0800
Subject: [PATCH] 拉新
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java | 6 +++---
1 files changed, 3 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 62627ec..2da5b18 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,18 +245,18 @@
String invalidMoney = "0.00";
if (page == 1) {
BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
- orderNo, state, startTime, endTime, listSource,false);
+ orderNo, state, startTime, endTime, listSource);
if (predictMoney != null)
validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
- orderNo, state, startTime, endTime, listSource,false);
+ orderNo, state, startTime, endTime, listSource);
if (postSaleMoney != null)
invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
if (orderType != null && dateType != null && dateType == 4) {
if (orderType == 1) {
- dateType = 6; // 杩斿埄璁㈠崟鏈夋晥
+ dateType = 6; // 杩斿埄璁㈠崟鏈夋晥鐨�
} else {
dateType = 5; // 鏂扮増鏌ヨ鏈湀鍒拌处
}
--
Gitblit v1.8.0