From 00ae986ab67e60a09464683e5985794e47aa19e0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 10:33:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
index f48ea43..dabda03 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
@@ -1,6 +1,8 @@
package com.ruoyi.order.vo;
import com.ruoyi.account.api.model.UserAddress;
+import com.ruoyi.account.api.vo.CouponInfoVo;
+import com.ruoyi.account.api.vo.PaymentUserCouponVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,14 +33,18 @@
private Integer earnPoint;
@ApiModelProperty("支付金额")
private BigDecimal payMoney;
- @ApiModelProperty("订单总金额")
+ @ApiModelProperty("订单总积分")
private Integer orderPoint;
@ApiModelProperty("剩余积分")
private Integer residualPoint;
@ApiModelProperty("收货地址")
private UserAddress userAddress;
+ @ApiModelProperty("快递费")
+ private BigDecimal expressFee;
@ApiModelProperty("支付方式（1=现金，2=积分）")
private Integer paymentType;
+ @ApiModelProperty("活动是否可以和优惠券同时使用")
+ private Boolean useSimultaneously;
@ApiModelProperty("优惠券列表")
- private List<CouponInfoVo> coupon;
+ private List<PaymentUserCouponVo> coupon;
}
--
Gitblit v1.7.1