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/MoneyCardOperationDto.java |   87 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 82 insertions(+), 5 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 9b5b356..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
@@ -8,9 +8,11 @@
 package com.matrix.system.hive.dto;
 
 import com.matrix.system.common.validate.group.Group;
+import com.matrix.system.hive.validation.MoneyCardUseGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @version: V1.0
@@ -26,37 +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,
+            Group.ADD.class
+    })
     private Long orderItemId;
 
 
     /**
-     * 充值卡的id
+     * 操作类型
      */
-    @NotNull(groups = Group.ADD.class)
+    @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+                        MoneyCardUseGroup.moneyCardUseOrderChange.class,
+            MoneyCardUseGroup.moneyCardUseCz.class,
+            Group.ADD.class
+
+    })
+    private String type;
+    /**
+     * 操作人
+     */
+    @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+                        MoneyCardUseGroup.moneyCardUseOrderChange.class,
+            MoneyCardUseGroup.moneyCardUseCz.class,
+            Group.ADD.class
+    })
+    private Long updateUser;
+    /**
+     * 订单id
+     */
+    @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+                        MoneyCardUseGroup.moneyCardUseOrderChange.class,
+            MoneyCardUseGroup.moneyCardUseCz.class,
+            Group.ADD.class
+    })
+    private Long  orderId;
+    /**
+     * 订单编号
+     */
+    @NotNull(groups = {MoneyCardUseGroup.moneyCardUseTk.class,
+                        MoneyCardUseGroup.moneyCardUseOrderChange.class,
+            MoneyCardUseGroup.moneyCardUseCz.class,
+            Group.ADD.class
+    })
+    private String orderNo;
+
+    /**
+     * 充值卡的商品
+     */
+    @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