From e23c8975e6bb0934cb5db46a94d0f83c9739d9ab Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Mar 2022 16:33:17 +0800
Subject: [PATCH] 重构：套餐项目
---
zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java b/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java
index ef6e04d..6b284ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java
@@ -1,5 +1,6 @@
package com.matrix.system.hive.dto;
+import com.matrix.system.hive.hievEnum.OrderOperationEnum;
import com.matrix.system.hive.validation.ProjUseGroup;
import lombok.Data;
@@ -14,25 +15,34 @@
/**
* 客户id
*/
- @NotNull(groups = {ProjUseGroup.addProject.class, ProjUseGroup.addTc.class })
+ @NotNull(groups = {ProjUseGroup.addProject.class,
+ ProjUseGroup.addTc.class})
private Long vipId;
/**
* 产品id
*/
- @NotNull(groups = {ProjUseGroup.addProject.class, ProjUseGroup.addTc.class, ProjUseGroup.projectTk.class})
+ @NotNull(groups = {ProjUseGroup.addProject.class,
+ ProjUseGroup.addTc.class,
+ ProjUseGroup.projectTk.class,
+ ProjUseGroup.taocanTk.class
+ })
private Long goodsId;
/**
* 添加次数
*/
- @NotNull(groups = {ProjUseGroup.addProject.class, ProjUseGroup.addTc.class, ProjUseGroup.projectTk.class})
+ @NotNull(groups = {ProjUseGroup.addProject.class,
+ ProjUseGroup.addTc.class,
+ ProjUseGroup.projectTk.class,
+ ProjUseGroup.taocanTk.class})
private Integer count;
/**
* 购买支付金额
*/
- @NotNull(groups = {ProjUseGroup.addProject.class, ProjUseGroup.addTc.class})
+ @NotNull(groups = {ProjUseGroup.addProject.class,
+ ProjUseGroup.addTc.class})
private Double payMoney;
/**
@@ -43,14 +53,24 @@
/**
* 订单明细id
*/
- @NotNull(groups = {ProjUseGroup.addProject.class, ProjUseGroup.addTc.class, ProjUseGroup.projectTk.class})
+ @NotNull(groups = {ProjUseGroup.addProject.class,
+ ProjUseGroup.addTc.class,
+ ProjUseGroup.projectTk.class,
+ ProjUseGroup.taocanTk.class})
private Long orderItemId;
/**
* 是否为赠送
*/
- @NotNull(groups = {ProjUseGroup.addProject.class, ProjUseGroup.addTc.class})
+ @NotNull(groups = {ProjUseGroup.addProject.class,
+ ProjUseGroup.addTc.class})
private boolean isFree;
+
+
+ /**
+ * 操作类型
+ */
+ private OrderOperationEnum orderOperationType;
/**
@@ -66,6 +86,12 @@
* -- 添加套餐下的项目必传
*/
private Long tcId;
+ /**
+ * 操作人id
+ */
+ @NotNull(groups = {ProjUseGroup.addProject.class,
+ ProjUseGroup.addTc.class})
+ private Long updateUserId;
}
--
Gitblit v1.9.1