From bc0898f18e741571608176d89cdd16b94c781913 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 May 2022 10:25:42 +0800
Subject: [PATCH] fix money_card_use 默认储值卡处理
---
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