TASK:返回继续支付链接、发票链接
This commit is contained in:
@@ -138,6 +138,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||||||
vo.setPrice(order.getTotalPrice());
|
vo.setPrice(order.getTotalPrice());
|
||||||
vo.setBuyerUsername("@" + (order.getBuyerUsername() != null ? order.getBuyerUsername() : ""));
|
vo.setBuyerUsername("@" + (order.getBuyerUsername() != null ? order.getBuyerUsername() : ""));
|
||||||
vo.setDate(order.getCreateTime());
|
vo.setDate(order.getCreateTime());
|
||||||
|
vo.setPaymentId(order.getPaymentId());
|
||||||
|
|
||||||
List<OrderItemEntity> items = itemsMap.getOrDefault(order.getId(), new ArrayList<>());
|
List<OrderItemEntity> items = itemsMap.getOrDefault(order.getId(), new ArrayList<>());
|
||||||
List<OrderVO.ItemVO> itemVOs = items.stream().map(item -> {
|
List<OrderVO.ItemVO> itemVOs = items.stream().map(item -> {
|
||||||
@@ -191,6 +192,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||||||
vo.setStatus(order.getStatus());
|
vo.setStatus(order.getStatus());
|
||||||
vo.setShopName(order.getShopName());
|
vo.setShopName(order.getShopName());
|
||||||
vo.setSellerId(order.getSellerId());
|
vo.setSellerId(order.getSellerId());
|
||||||
|
vo.setPaymentId(order.getPaymentId());
|
||||||
|
|
||||||
List<OrderItemEntity> items = itemsMap.getOrDefault(order.getId(), Collections.emptyList());
|
List<OrderItemEntity> items = itemsMap.getOrDefault(order.getId(), Collections.emptyList());
|
||||||
List<BuyerOrderItemVO> itemVOs = items.stream().map(item -> {
|
List<BuyerOrderItemVO> itemVOs = items.stream().map(item -> {
|
||||||
|
|||||||
@@ -38,4 +38,8 @@ public class BuyerOrderVO implements Serializable {
|
|||||||
|
|
||||||
@Schema(description = "商品明细列表")
|
@Schema(description = "商品明细列表")
|
||||||
private List<BuyerOrderItemVO> items;
|
private List<BuyerOrderItemVO> items;
|
||||||
|
|
||||||
|
@Schema(description = "支付ID")
|
||||||
|
@JsonSerialize(using = ToStringSerializer.class)
|
||||||
|
private Long paymentId;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ public class OrderVO implements Serializable {
|
|||||||
@JsonSerialize(using = ToStringSerializer.class)
|
@JsonSerialize(using = ToStringSerializer.class)
|
||||||
private Long orderId;
|
private Long orderId;
|
||||||
|
|
||||||
|
@Schema(description = "交易流水号")
|
||||||
|
private Long paymentId;
|
||||||
|
|
||||||
@Schema(description = "商品明细列表")
|
@Schema(description = "商品明细列表")
|
||||||
private List<ItemVO> items;
|
private List<ItemVO> items;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user