查询待支付订单, 添加订单号

This commit is contained in:
Guoqs
2025-04-01 17:04:34 +08:00
parent c437aa7ed1
commit f12cca4b9d
5 changed files with 64 additions and 42 deletions

View File

@@ -139,4 +139,6 @@ public interface OrderPileOccupyMapper {
* @return
*/
int makeOrderFree(String occupyCode);
}
List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId);
}

View File

@@ -84,6 +84,8 @@ public interface OrderPileOccupyService{
Map<String, Object> payOccupyPileOrder(PayOrderDTO dto);
List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId);
Map<String, Object> queryUnPayOrder(String memberId);
/**

View File

@@ -413,17 +413,23 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
return orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId);
}
@Override
public List<OrderPileOccupy> queryUnPayOrderListByMemberId(String memberId) {
return orderPileOccupyMapper.queryUnPayOrderListByMemberId(memberId);
}
@Override
public Map<String, Object> queryUnPayOrder(String memberId) {
Map<String, Object> resultMap = Maps.newHashMap();
OrderPileOccupy orderPileOccupy = orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId);
if (orderPileOccupy != null) {
resultMap.put("occupyCode", orderPileOccupy.getOccupyCode());
List<OrderPileOccupy> orderPileOccupyList = this.queryUnPayOrderListByMemberId(memberId);
if (CollectionUtils.isNotEmpty(orderPileOccupyList)) {
List<String> occupyOrderCode = orderPileOccupyList.stream().map(OrderPileOccupy::getOccupyCode).collect(Collectors.toList());
resultMap.put("occupyOrderCode", occupyOrderCode);
}
List<OrderBasicInfo> orderList = orderBasicInfoService.queryRepayOrder(memberId);
if (CollectionUtils.isNotEmpty(orderList)) {
List<String> orderCodeList = orderList.stream().map(OrderBasicInfo::getOrderCode).collect(Collectors.toList());
resultMap.put("occupyCode", orderCodeList);
resultMap.put("chargerOrderCode", orderCodeList);
}
return resultMap;
}