From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java | 7 ++++---
1 files changed, 4 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..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
@@ -1,7 +1,6 @@
package com.hz.his.dto.coupon;
-import com.hz.his.dto.order.OrderPayMethodDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -18,9 +17,11 @@
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