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/model/TOrder.java | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOrder.java b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
index 284fe72..0845460 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrder.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrder.java
@@ -50,34 +50,6 @@
@TableField("storeId")
private Integer storeId;
-// @ApiModelProperty(value = "镜架型号id")
-// @TableField("modelId")
-// private Integer modelId;
-
-// @ApiModelProperty(value = "镜架色号")
-// @TableField("color")
-// private String color;
-//
-// @ApiModelProperty(value = "镜片系列id")
-// @TableField("series")
-// private Integer series;
-
-// @ApiModelProperty(value = "镜片右 球镜+柱镜 逗号拼接 字段为空 客户自带")
-// @TableField("rLens")
-// private String rLens;
-//
-// @ApiModelProperty(value = "镜片左 球镜+柱镜 逗号拼接 字段为空 客户自带")
-// @TableField("lLens")
-// private String lLens;
-
-// @ApiModelProperty(value = "1球 2非球面 3双非")
-// @TableField("type")
-// private Integer type;
-//
-// @ApiModelProperty(value = "折射率")
-// @TableField("refractiveIndex")
-// private String refractiveIndex;
-
@ApiModelProperty(value = "店铺员工id")
@TableField("sysId")
private Integer sysId;
@@ -85,10 +57,6 @@
@ApiModelProperty(value = "优惠券领取id")
@TableField("couponId")
private Integer couponId;
-//
-// @ApiModelProperty(value = "收费项id")
-// @TableField("itemsId")
-// private Integer itemsId;
@ApiModelProperty(value = "备注")
@TableField("remark")
@@ -156,17 +124,29 @@
@ApiModelProperty(value = "用户性别 1男2女")
@TableField("gender")
private Integer gender;
+ @ApiModelProperty(value = "收费项id")
+ @TableField("itemsId")
+ private Integer itemsId;
@ApiModelProperty(value = "微信昵称")
@TableField("name")
- private Integer name;
+ private String name;
@ApiModelProperty(value = "支付方式")
@TableField("payTypeName")
private String payTypeName;
+ @ApiModelProperty(value = "确认结算后的支付方式和金额")
+ @TableField("confirmPayType")
+ private String confirmPayType;
@ApiModelProperty(value = "手续费扣除")
+ @TableField("commission")
private BigDecimal commission;
@ApiModelProperty(value = "笨蛋毛利")
+ @TableField("profitMoney")
private BigDecimal profitMoney;
@ApiModelProperty(value = "毛利率")
+ @TableField("profitRating")
private BigDecimal profitRating;
+ @ApiModelProperty(value = "验光来源 1=外部验光 2=门店修改 3=客户自改")
+ @TableField("profitRating")
+ private Integer optometrySource;
}
--
Gitblit v1.7.1