From 3758c5dec1b37a58ea2dc2123c90415349dccee3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 一月 2019 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 44c7a85..2c48c1e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -135,6 +135,12 @@
public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {
return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);
}
+
+ @Override
+ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day,
+ String startTime, String endTime) {
+ return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);
+ }
@Override
public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
@@ -475,8 +481,31 @@
if (list.size() == 0) {
return list;
}
-
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
for (CommonOrderVO order : list) {
+
+ // 涓嬪崟鏃堕棿
+ Date thirdCreateTime = order.getThirdCreateTime();
+ if (thirdCreateTime != null) {
+ order.setDownTime(format.format(thirdCreateTime));
+ }
+ // 鏀惰揣鏃堕棿
+ Date settleTime = order.getSettleTime();
+ if (settleTime != null) {
+ order.setReceiveTime(format.format(settleTime));
+ }
+
+ // 鍒拌处鏃堕棿
+ Date accountTime = order.getAccountTime();
+ if (accountTime != null) {
+ order.setHongBaoDate(format.format(accountTime));
+ }
+
+ BigDecimal settlement = order.getSettlement();
+ if (settlement != null && settlement.compareTo(new BigDecimal(0)) > 0) {
+ order.setPayment(settlement); // 瀹為檯浠樻閲戦
+ }
/* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
Integer hongBaoType = order.getHongBaoType();
@@ -506,6 +535,7 @@
// 宸插け鏁�
order.setHongBaoState(3);
}
+
}
return list;
--
Gitblit v1.8.0