mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-28 15:05:18 +08:00
Merge branch 'dev-zza' into dev
This commit is contained in:
@@ -12,6 +12,7 @@ import com.jsowell.common.util.DateUtils;
|
||||
import com.jsowell.common.util.StringUtils;
|
||||
import com.jsowell.pile.domain.AdapayMemberAccount;
|
||||
import com.jsowell.pile.domain.OrderSplitRecord;
|
||||
import com.jsowell.pile.dto.QueryOrderSplitDTO;
|
||||
import com.jsowell.pile.dto.SplitOrderDTO;
|
||||
import com.jsowell.pile.mapper.OrderSplitRecordMapper;
|
||||
import com.jsowell.pile.service.AdapayMemberAccountService;
|
||||
@@ -251,6 +252,20 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后管页面查询某站点下订单分账数据
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<OrderSplitRecordVO> queryOrderSplitData(QueryOrderSplitDTO dto) {
|
||||
List<OrderSplitRecordVO> orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(dto);
|
||||
// 根据 orderCode 分组
|
||||
Map<String, List<OrderSplitRecordVO>> collect = orderSplitRecordVOS.stream()
|
||||
.collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode));
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime) {
|
||||
return orderSplitRecordMapper.queryOrderSplitRecordByMemberId(adapayMemberId, startTime, endTime);
|
||||
|
||||
Reference in New Issue
Block a user