From 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:44:10 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java b/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
index 194e7b0..1eb1a5d 100644
--- a/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
+++ b/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
@@ -1,7 +1,10 @@
package com.jilongda.manage.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.jilongda.manage.model.TOptometryDetail;
import com.jilongda.manage.model.TOrder;
+import com.jilongda.manage.model.TOrderGoods;
+import com.jilongda.manage.model.TOrderItems;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@@ -13,7 +16,10 @@
@Data
@ApiModel(value = "核算订单详情VO")
public class TOrderAccountVO {
-
+ @ApiModelProperty(value = "用户id")
+ private Integer userId;
+ @ApiModelProperty(value = "验光单id")
+ private Integer optometryId;
@ApiModelProperty(value = "用户信息-微信昵称")
private String name;
@ApiModelProperty(value = "用户信息-手机号")
@@ -24,11 +30,13 @@
private String realName;
@ApiModelProperty(value = "用户信息-性别 1男2女")
private Integer gender;
+ @ApiModelProperty(value = "收费项id")
+ private Integer itemsId;
@ApiModelProperty(value = "配镜处方")
private List<TOptometryDetail> optometryDetails;
@ApiModelProperty(value = "商品核算")
- private List<TOrderGoodsVO> orderGoods;
+ private List<TOrderGoods> orderGoods;
@ApiModelProperty(value = "门店名称")
private String storeName;
@ApiModelProperty(value = "商品小计")
@@ -39,6 +47,8 @@
private BigDecimal payMoney;
@ApiModelProperty(value = "支付方式")
private String payType;
+ @ApiModelProperty(value = "确认核算后的支付方式和支付金额")
+ private List<TOrderItems> orderItems;
@ApiModelProperty(value = "实收金额")
private BigDecimal realPayMoney;
@ApiModelProperty(value = "手续费扣除")
--
Gitblit v1.7.1