sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加支付单列表

Browse Source
This commit is contained in:
zhangli
2025-08-23 16:05:29 +08:00
parent 97bc8f9565
commit fbce38bdca
4 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sczx/order/convert/OrderSubConvert.java
View File

@ -1,6 +1,7 @@
package com.sczx.order.convert;
import com.sczx.order.dto.OrderSubDTO;
import com.sczx.order.dto.PayOrderDTO;
import com.sczx.order.po.OrderSubPO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
@ -12,4 +13,6 @@ public interface OrderSubConvert {
OrderSubConvert INSTANCE = Mappers.getMapper(OrderSubConvert.class);
OrderSubDTO poToDto(OrderSubPO orderSubPO);
List<OrderSubDTO> posToDtos(List<OrderSubPO> orderSubPOList);
List<PayOrderDTO> posToPayOrderDtos(List<OrderSubPO> orderSubPOList);
}

6
src/main/java/com/sczx/order/dto/OrderDetailDTO.java
View File

@ -164,4 +164,10 @@ public class OrderDetailDTO {
@ApiModelProperty("订单车辆图片-车损")
private List<OrderCarImgDTO> orderCarImgDamageList;
@ApiModelProperty("最新支付单号")
private String lastPayOrderNo;
@ApiModelProperty("支付订单信息")
private List<PayOrderDTO> payOrderDTOList;
}

28
src/main/java/com/sczx/order/dto/PayOrderDTO.java Normal file
View File

@ -0,0 +1,28 @@
package com.sczx.order.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@ApiModel(value = "支付订单dto", description = "支付订单信息")
public class PayOrderDTO {
@ApiModelProperty("订单金额")
private BigDecimal amount;
@ApiModelProperty("支付方式")
private String paymentMethod;
@ApiModelProperty("订单产生时间")
private LocalDateTime createdAt;
@ApiModelProperty("支付ID")
private String paymentId;
@ApiModelProperty("支付状态")
private String payStatus;
}

11
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -599,7 +599,16 @@ public class OrderServiceImpl implements OrderService {
List<OrderCarImgDTO> orderCarImgDamageList = orderCarImgList.stream().filter(orderCarImgDTO -> StringUtils.equalsIgnoreCase(orderCarImgDTO.getImgType(), OrderCarImgTypeEnum.CAR_DAMAGE.getCode())).collect(Collectors.toList());
orderDetailDTO.setOrderCarImgDamageList(orderCarImgDamageList);
}
else if(OrderStatusEnum.RENT_ING.getCode().equalsIgnoreCase(orderMainPO.getOrderStatus())){
LambdaQueryWrapper<OrderSubPO> querySubWrapper2 = new LambdaQueryWrapper<>();
querySubWrapper2.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId())
.eq(OrderSubPO::getPayStatus, PayStatusEnum.SUCCESS.getCode()).orderByDesc(OrderSubPO::getCreateTime);
List<OrderSubPO> orderSubPOList2 = orderSubRepo.list(querySubWrapper2);
if(!CollectionUtils.isEmpty(orderSubPOList2)){
orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId());
orderDetailDTO.setPayOrderDTOList(OrderSubConvert.INSTANCE.posToPayOrderDtos(orderSubPOList2));
}
if(OrderStatusEnum.RENT_ING.getCode().equalsIgnoreCase(orderMainPO.getOrderStatus())){
//如果是租车中，需要判断是否逾期了
log.info("判断订单是否逾期");
if(orderMainPO.getEndRentTime()!=null){