|
|
@@ -536,6 +536,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
|
|
|
public ResultContent<Page<ExpenseFlowModel>> pageBusMainOrder(ExpenseFlowSearch param, Pageable pageable) {
|
|
|
// 查询支付成功的
|
|
|
param.setIsPaySuccess(Boolean.TRUE);
|
|
|
+ param.setOrderModeType(OrderModeType.Consume);
|
|
|
// 用户搜索的商户
|
|
|
List<String> shopOids = getSearchAllShopOid(param);
|
|
|
if (ObjectUtils.isEmpty(shopOids)) {
|
|
|
@@ -603,6 +604,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
|
|
|
public ResultContent<ExpenseFlowCount> countBuinessMainPayment(ExpenseFlowSearch param) {
|
|
|
// 查询支付成功的
|
|
|
param.setIsPaySuccess(Boolean.TRUE);
|
|
|
+ param.setOrderModeType(OrderModeType.Consume);
|
|
|
// 用户搜索的商户
|
|
|
List<String> shopOids = getSearchAllShopOid(param);
|
|
|
if (ObjectUtils.isEmpty(shopOids)) {
|
|
|
@@ -624,6 +626,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
|
|
|
|
|
|
ExpenseFlowSearch param = new ExpenseFlowSearch();
|
|
|
param.setIsPaySuccess(Boolean.TRUE);
|
|
|
+ param.setOrderModeType(OrderModeType.Consume);
|
|
|
BeanUtils.copyProperties(statisticSearch, param);
|
|
|
|
|
|
List<String> shopOids = getSearchAllShopOid(param);
|