From 583fc7b7ed2ab5961c50e24e779262f168b9d55f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:46:39 +0800
Subject: [PATCH] 20220505

---
 zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 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 7c7ddec..138c742 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,7 +1,7 @@
 package com.matrix.system.hive.dto;
 
+import com.matrix.system.hive.hievEnum.OrderOperationEnum;
 import com.matrix.system.hive.validation.ProjUseGroup;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
@@ -15,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})
+    @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})
+    @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;
 
     /**
@@ -44,14 +53,25 @@
     /**
      * 订单明细id
      */
-    @NotNull(groups = {ProjUseGroup.addProject.class, ProjUseGroup.addTc.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;
+
 
     /**
      * 套餐折扣
@@ -67,5 +87,16 @@
      */
     private Long tcId;
 
+    /**
+     * 项目单次划扣数量,默认设置为1
+     */
+    private Integer deductionNum;
+    /**
+     * 操作人id
+     */
+    @NotNull(groups = {ProjUseGroup.addProject.class,
+            ProjUseGroup.addTc.class})
+    private Long updateUserId;
+
 
 }

--
Gitblit v1.9.1