From 568cce9bd9b986c90aaeabe1a9a5ae5a6eefdaf3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 09 一月 2019 18:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 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 0edf0fb..a398442 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
@@ -81,14 +81,14 @@
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
throws CommonOrderException {
- return commonOrderMapper.listGroupOrderNoByUid(start, count, uid, state, type, orderState, orderNo, startTime,
+ return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime,
endTime, dateType);
}
@Override
public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
String startTime, String endTime, Integer dateType) throws CommonOrderException {
- return commonOrderMapper.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime, endTime,
+ return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime,
dateType);
}
@@ -108,7 +108,7 @@
}
// 鍟嗗搧淇℃伅
- List<CommonOrderVO> listGoods = commonOrderMapper.listByOrderNoAndType(listOrder);
+ List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);
// 璁㈠崟鍟嗗搧涓虹┖
if (listGoods == null || listGoods.size() == 0) {
return listOrder;
@@ -121,18 +121,18 @@
}
@Override
- public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day) {
- return commonOrderMapper.countOrderByHongBaoType(uid, day);
+ public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day) {
+ return commonOrderMapper.countHistoryOrder(uid, day);
}
@Override
- public long countOrder(Long uid, Integer type, Integer day) {
- return commonOrderMapper.countBonusOrder(uid, type, day);
+ public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime) {
+ return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime);
}
@Override
- public BigDecimal countOrderMoney(Long uid, Integer type, Integer day) {
- return commonOrderMapper.countBonusOrderMoney(uid, type, day);
+ public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {
+ return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);
}
@Override
@@ -427,11 +427,6 @@
return commonOrderList;
}
- @Override
- public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime,
- String endTime, Integer day) {
- return commonOrderMapper.countMoneyGroupOrderNoByUid(uid, type, orderNo, startTime, endTime, day);
- }
@Override
public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate) {
--
Gitblit v1.8.0