Merge branch 'dev-zza' into dev

This commit is contained in:
Lemon
2025-04-11 13:57:55 +08:00
11 changed files with 148 additions and 4 deletions

View File

@@ -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);