From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
index 643be7e..3b5b18e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java
@@ -12,14 +12,21 @@
  */
 @Data
 public class CouponCheckDto {
+    /**褰撳墠缁撹处鎿嶄綔骞冲彴AppId*/
+    private String appId;
 
     /**鐢ㄦ埛浼樻儬鍒哥爜鏍囪瘑闆嗗悎*/
     private List<String> couponNumberIdList;
-
-    /**鍟嗗搧鎬婚噾棰�*/
-    private BigDecimal total;
-    /**鍟嗗搧鎬讳欢鏁�*/
-    private Integer itemNum;
     /**鍟嗗搧淇℃伅*/
     private List<CouponCheckItemDto> goodsList;
+    /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
+    private List<String> payMethodList;
+
+    /** 妫�鏌ヤ紭鎯犲埜鐮佹槸鍚﹀凡琚娇鐢紝榛樿ture妫�鏌ワ紝鍗囧崟鏄痜alse涓嶆鏌� */
+    private boolean checkCouponNumberIsUse = true;
+
+    /**鍟嗗搧鎬婚噾棰�(鏆傛棤鐢�-涓嶄紶)*/
+    private BigDecimal total;
+    /**鍟嗗搧鎬讳欢鏁�(鏆傛棤鐢�-涓嶄紶)*/
+    private Integer itemNum;
 }

--
Gitblit v1.8.0