From 34f741f39e22bf48df33321230380b40c23110c3 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 18 四月 2025 21:34:13 +0800 Subject: [PATCH] 店铺、积分、订单 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java | 36 +++++++----------------------------- 1 files changed, 7 insertions(+), 29 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java index 71aee58..32d279d 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderInfoVo.java @@ -17,65 +17,43 @@ public class OrderInfoVo { @ApiModelProperty("订单id") private String id; - @ApiModelProperty("售后订单id") - private String refundPassId; @ApiModelProperty("订单编号") private String orderNumber; @ApiModelProperty("下单时间") private String createTime; - @ApiModelProperty("订单状态(1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价)") + @ApiModelProperty("订单状态(3待使用4已完成5已取消8已评价)") private Integer orderStatus; @ApiModelProperty("下单用户") private String userName; @ApiModelProperty("联系电话") private String phone; - @ApiModelProperty("订单类型") - private String orderType; - @ApiModelProperty("核销门店") + @ApiModelProperty("门店名称") private String shopName; - @ApiModelProperty("支付方式(1=微信,2=余额,3=积分)") + @ApiModelProperty("支付方式(1=微信,2=余额,3=积分,4=组合支付)") private Integer paymentMethod; @ApiModelProperty("订单总金额") private BigDecimal totalAmount; @ApiModelProperty("支付积分") private Integer point; - @ApiModelProperty("优惠券") - private String couponName; - @ApiModelProperty("抵扣金额") - private BigDecimal discountAmount; - @ApiModelProperty("快递费") - private BigDecimal expressAmount; @ApiModelProperty("支付金额") private BigDecimal paymentAmount; - @ApiModelProperty("获得积分") - private Integer getPoint; - @ApiModelProperty("收件人") - private String recipient; - @ApiModelProperty("收件地址") - private String address; - @ApiModelProperty("物流信息") - private MapTrackKD100Vo express; + @ApiModelProperty("抵扣金额") + private BigDecimal pointDeductionAmount; @ApiModelProperty("商品数量") private Integer goodsNum; @ApiModelProperty("商品信息") private String goodsJson; + @ApiModelProperty("秒杀活动信息") + private String seckillJson; @ApiModelProperty("核销时间") private String writeOffTime; - @ApiModelProperty("服务技师") - private String technicianName; @ApiModelProperty("核销人") private String canceller; - @ApiModelProperty("分佣金额") - private BigDecimal subcommission; @ApiModelProperty("售后截止时间") private String afterSaleTime; @ApiModelProperty("活动名称") private String activityName; @ApiModelProperty("核销码BASE64") private String writeOffCode; - @ApiModelProperty("快递公司") - private String expressCompany; - @ApiModelProperty("快递单号") - private String expressNumber; } -- Gitblit v1.7.1