From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 91bdd50..d2d4411 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
@@ -169,26 +169,30 @@
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
throws CommonOrderException {
+ List<Integer> listSource = new ArrayList<>();
+ if (source != null) {
+ listSource.add(source);
+ }
+
return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,
- dateType, source);
+ dateType, listSource);
}
@Override
public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {
+ String startTime, String endTime, Integer dateType, List<Integer> listSource) throws CommonOrderException {
return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
- source);
+ listSource);
}
@Override
public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
- Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, List<Integer> listSource)
throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
-
- List<CommonOrderVO> listOrder = listGroupOrderNoByUid((page - 1) * pageSize, pageSize, uid, state, type,
- orderState, orderNo, startTime, endTime, dateType, source);
+ List<CommonOrderVO> listOrder = commonOrderMapper.listUserOrder((page - 1) * pageSize, pageSize, uid, state, type,
+ orderState, orderNo, startTime, endTime, dateType, listSource);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -814,8 +818,8 @@
}
@Override
- public OrderCountVO getOrderCount(Long uid, Integer day, Integer source) {
- return commonOrderMapper.getOrderCount(uid, day, source);
+ public OrderCountVO getOrderCount(Long uid, Integer day, List<Integer> listSource) {
+ return commonOrderMapper.getOrderCount(uid, day, listSource);
}
@Override
--
Gitblit v1.8.0