From 739f7bd9822f81624afd47b814372f00f8ddfcfc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 09:54:05 +0800
Subject: [PATCH] 修改
---
applet/src/main/java/com/jilongda/applet/model/TOrder.java | 104 +++++++++++++++++++++++++++-------------------------
1 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/model/TOrder.java b/applet/src/main/java/com/jilongda/applet/model/TOrder.java
index b3c7126..9d9d54e 100644
--- a/applet/src/main/java/com/jilongda/applet/model/TOrder.java
+++ b/applet/src/main/java/com/jilongda/applet/model/TOrder.java
@@ -50,45 +50,45 @@
@TableField("storeId")
private Integer storeId;
- @ApiModelProperty(value = "镜架型号id")
- @TableField("modelId")
- private Integer modelId;
+// @ApiModelProperty(value = "镜架型号id")
+// @TableField("modelId")
+// private Integer modelId;
- @ApiModelProperty(value = "镜架色号")
- @TableField("color")
- private String color;
+// @ApiModelProperty(value = "镜架色号")
+// @TableField("color")
+// private String color;
+//
+// @ApiModelProperty(value = "镜片系列id")
+// @TableField("series")
+// private Integer series;
- @ApiModelProperty(value = "镜片系列id")
- @TableField("series")
- private Integer series;
+// @ApiModelProperty(value = "镜片右 球镜+柱镜 逗号拼接 字段为空 客户自带")
+// @TableField("rLens")
+// private String rLens;
+//
+// @ApiModelProperty(value = "镜片左 球镜+柱镜 逗号拼接 字段为空 客户自带")
+// @TableField("lLens")
+// private String lLens;
- @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 = "1球 2非球面 3双非")
+// @TableField("type")
+// private Integer type;
+//
+// @ApiModelProperty(value = "折射率")
+// @TableField("refractiveIndex")
+// private String refractiveIndex;
@ApiModelProperty(value = "店铺员工id")
@TableField("sysId")
private Integer sysId;
- @ApiModelProperty(value = "优惠券id")
+ @ApiModelProperty(value = "优惠券领取id")
@TableField("couponId")
private Integer couponId;
-
- @ApiModelProperty(value = "收费项id")
- @TableField("itemsId")
- private Integer itemsId;
+//
+// @ApiModelProperty(value = "收费项id")
+// @TableField("itemsId")
+// private Integer itemsId;
@ApiModelProperty(value = "备注")
@TableField("remark")
@@ -121,6 +121,9 @@
@ApiModelProperty(value = "支付金额")
@TableField("payMoney")
private BigDecimal payMoney;
+ @ApiModelProperty(value = "手续费金额")
+ @TableField("commissionMoney")
+ private BigDecimal commissionMoney;
@ApiModelProperty(value = "是否加工 1是2否")
@TableField("isMachining")
@@ -141,33 +144,34 @@
@ApiModelProperty(value = "核算时间")
@TableField("accountingTime")
private LocalDateTime accountingTime;
-
- @ApiModelProperty(value = "品牌id")
- @TableField("brandId")
- private Integer brandId;
-
- @ApiModelProperty(value = "品牌名称")
- @TableField("brandName")
- private String brandName;
-
- @ApiModelProperty(value = "系列名称")
- @TableField("seriesName")
- private String seriesName;
-
- @ApiModelProperty(value = "型号名称")
- @TableField("modelName")
- private String modelName;
- @ApiModelProperty(value = "手动添加订单-用户姓名")
+ @ApiModelProperty(value = "用户姓名")
@TableField("realName")
private String realName;
- @ApiModelProperty(value = "手动添加订单-用户手机号")
+ @ApiModelProperty(value = "用户手机号")
@TableField("phone")
private String phone;
- @ApiModelProperty(value = "手动添加订单-用户年龄")
+ @ApiModelProperty(value = "用户年龄")
@TableField("age")
private Integer age;
- @ApiModelProperty(value = "手动添加订单-用户性别 1男2女")
+ @ApiModelProperty(value = "用户性别 1男2女")
@TableField("gender")
private Integer gender;
-
+ @ApiModelProperty(value = "微信昵称")
+ @TableField("name")
+ private Integer name;
+ @ApiModelProperty(value = "支付方式")
+ @TableField("payTypeName")
+ private String payTypeName;
+ @ApiModelProperty(value = "手续费扣除")
+ @TableField("commission")
+ private BigDecimal commission;
+ @ApiModelProperty(value = "笨蛋毛利")
+ @TableField("profitMoney")
+ private BigDecimal profitMoney;
+ @ApiModelProperty(value = "毛利率")
+ @TableField("profitRating")
+ private BigDecimal profitRating;
+ @ApiModelProperty(value = "验光来源")
+ @TableField("profitRating")
+ private Integer optometrySource;
}
--
Gitblit v1.7.1