From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/hive/dto/MoneyCardOperationDto.java | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dto/MoneyCardOperationDto.java b/zq-erp/src/main/java/com/matrix/system/hive/dto/MoneyCardOperationDto.java
index 6d0040d..9e5f5e0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dto/MoneyCardOperationDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dto/MoneyCardOperationDto.java
@@ -12,6 +12,7 @@
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.util.List;
/**
* @version: V1.0
@@ -27,59 +28,112 @@
/**
* 储值卡id
*/
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseOrderChange.class,
+ MoneyCardUseGroup.moneyCardUseCz.class,})
private Long carUseId;
/**
* 会员id
*/
- @NotNull(groups = Group.ADD.class)
+ @NotNull(groups = {
+ Group.ADD.class
+ })
private Long vipId;
/**
* 来源,购买，转让，赠送
*/
- @NotNull(groups = Group.ADD.class)
+ @NotNull(groups = {
+ Group.ADD.class})
private String source;
/**
* 订单明细id
*/
- @NotNull(groups = Group.ADD.class)
- @NotNull(groups = MoneyCardUseGroup.moneyCardUseTk.class)
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+ Group.ADD.class
+ })
private Long orderItemId;
/**
* 操作类型
*/
- @NotNull(groups = MoneyCardUseGroup.moneyCardUseTk.class)
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+ MoneyCardUseGroup.moneyCardUseOrderChange.class,
+ MoneyCardUseGroup.moneyCardUseCz.class,
+ Group.ADD.class
+
+ })
private String type;
/**
* 操作人
*/
- @NotNull(groups = MoneyCardUseGroup.moneyCardUseTk.class)
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+ MoneyCardUseGroup.moneyCardUseOrderChange.class,
+ MoneyCardUseGroup.moneyCardUseCz.class,
+ Group.ADD.class
+ })
private Long updateUser;
/**
* 订单id
*/
- @NotNull(groups = MoneyCardUseGroup.moneyCardUseTk.class)
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+ MoneyCardUseGroup.moneyCardUseOrderChange.class,
+ MoneyCardUseGroup.moneyCardUseCz.class,
+ Group.ADD.class
+ })
private Long orderId;
/**
* 订单编号
*/
- @NotNull(groups = MoneyCardUseGroup.moneyCardUseTk.class)
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+ MoneyCardUseGroup.moneyCardUseOrderChange.class,
+ MoneyCardUseGroup.moneyCardUseCz.class,
+ Group.ADD.class
+ })
private String orderNo;
+
/**
- * 充值卡的id
+ * 充值卡的商品
*/
- @NotNull(groups = Group.ADD.class)
+ @NotNull(groups = {
+ Group.ADD.class})
private Long goodsId;
+ /**
+ * 赠送金额扣减
+ */
+ @NotNull(groups = {
+ MoneyCardUseGroup.moneyCardUseCz.class,
+ MoneyCardUseGroup.moneyCardUseOrderChange.class
+ })
+ private Double giftMoney;
+ /**
+ * 本金扣减
+ */
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+ MoneyCardUseGroup.moneyCardUseCz.class,
+ MoneyCardUseGroup.moneyCardUseOrderChange.class
+ })
+ private Double realMoney;
+
+ /**
+ * 次数
+ */
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseOrderChange.class})
+ private Integer count;
/**
* 备注
*/
private String remark;
+ /**
+ * 支付的商品id
+ */
+ @NotNull(groups = {MoneyCardUseGroup.moneyCardUseOrderChange.class})
+ private List<Long> goodsIds;
+
}
\ No newline at end of file
--
Gitblit v1.9.1