From a1acacfb8cfa4b0e2fc07fbf214f4f9b47636c98 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 15 三月 2024 18:44:10 +0800
Subject: [PATCH] Merge branch 'fhx-prod-FDD' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 03285e2..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
@@ -1,7 +1,6 @@
 package com.hz.his.dto.coupon;
 
 
-import com.hz.his.dto.order.OrderPayMethodDto;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -13,14 +12,18 @@
  */
 @Data
 public class CouponCheckDto {
+    /**褰撳墠缁撹处鎿嶄綔骞冲彴AppId*/
+    private String appId;
 
     /**鐢ㄦ埛浼樻儬鍒哥爜鏍囪瘑闆嗗悎*/
     private List<String> couponNumberIdList;
     /**鍟嗗搧淇℃伅*/
     private List<CouponCheckItemDto> goodsList;
-    /**鏀粯鏂瑰紡:payMethodNo鏀粯鏂瑰紡缂栧彿 payMethodName鏀粯鏂瑰紡鍚嶇О*/
-    private List<OrderPayMethodDto> payMethodDtoList;
+    /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
+    private List<String> payMethodList;
 
+    /** 妫�鏌ヤ紭鎯犲埜鐮佹槸鍚﹀凡琚娇鐢紝榛樿ture妫�鏌ワ紝鍗囧崟鏄痜alse涓嶆鏌� */
+    private boolean checkCouponNumberIsUse = true;
 
     /**鍟嗗搧鎬婚噾棰�(鏆傛棤鐢�-涓嶄紶)*/
     private BigDecimal total;

--
Gitblit v1.8.0