From daf17245eec06124050cb7218dfb301756cff334 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 15 十一月 2023 16:34:46 +0800
Subject: [PATCH] Merge branch 'chenjiahe-订单积分' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java |   15 ++++++++++-----
 1 files changed, 10 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..f4336cb 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
@@ -15,11 +15,16 @@
 
     /**鐢ㄦ埛浼樻儬鍒哥爜鏍囪瘑闆嗗悎*/
     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