From e915a40b79552686b8d8a8cfc48a341fa2c0f518 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 27 十一月 2019 18:08:47 +0800
Subject: [PATCH] 订单统计 + 资金明细
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 11 ++++++++++-
1 files changed, 10 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 7f5fc6e..d6bfb98 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
@@ -72,6 +72,7 @@
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.OrderCountVO;
import com.yeshi.fanli.vo.order.WeiQuanInfo;
import net.sf.json.JSONObject;
@@ -494,6 +495,9 @@
order.setVipOrder(false);
} else
order.setVipOrder(false);
+
+ if(order.isVipOrder())
+ order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
}
for (CommonOrderVO order : listOrder) {
@@ -794,6 +798,11 @@
@Override
public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {
return commonOrderMapper.countHistoryOrder(uid, day, source);
+ }
+
+ @Override
+ public OrderCountVO getOrderCount(Long uid, Integer day, Integer source) {
+ return commonOrderMapper.getOrderCount(uid, day, source);
}
@Override
@@ -1621,7 +1630,7 @@
public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {
return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);
}
-
+
@Override
public long count24HValidOrderByUid(Long uid, Date minTime) {
return commonOrderMapper.count24HValidOrderByUid(uid, minTime);
--
Gitblit v1.8.0