From f8f3856153460f3916d8c9d6da2f0b732114c28e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 25 八月 2023 14:44:50 +0800
Subject: [PATCH] Merge branch 'fhx-prod-订单升单' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java | 37 +++++++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 2 ++
3 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
index c5d7609..2f5a118 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
@@ -31,5 +31,7 @@
/** 璁㈠崟鏍囪瘑List */
private List<String> orderIdList;
+ /** 璁㈠崟鏍囪瘑 */
+ private String orderId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java
new file mode 100644
index 0000000..f4bfde3
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java
@@ -0,0 +1,37 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟鏀粯鏂瑰紡dto
+ * @USER: fhx
+ * @DATE: 2023/8/24
+ **/
+@Data
+public class OrderConsumePayDto {
+
+ /** 瀹為檯鏀粯閲戦 */
+ private BigDecimal amount;
+ /** 鏀粯缂栫爜 */
+ private String method;
+ /** 鏀粯鏂瑰紡鍚嶇О */
+ private String methodName;
+ /** 鏀粯鐨勫晢鍝�/椤圭洰/缁勫悎濂楅/缁勫悎鍗￠」鐨勬爣璇� */
+ private String commonId;
+ /** 鍗￠」鐨勬潈鐩婄被鍨嬫爣璇� */
+ private String cardEquityId;
+ /** 鐢ㄦ埛鍗″寘鏍囪瘑 */
+ private String userCardId;
+ /** 瀵瑰簲鍒ゆ柇鏍囪瘑锛屽鏋滄椂绉垎鏀粯鏃跺搴旓細101=涓嶉渶鎵ｅ噺绉垎锛�100=闇�瑕佹墸鍑忕Н鍒� */
+ private Integer isDel = 0;
+
+ public OrderConsumePayDto() {
+ }
+
+ public OrderConsumePayDto(BigDecimal amount, String method) {
+ this.amount = amount;
+ this.method = method;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 543ace4..ded4a22 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -24,6 +24,8 @@
private List<PayAmountDto> amount;
/**蹇呭～ 鎿嶄綔浜烘爣璇�,crm濉敤鎴�*/
private String operatorId;
+ /** 鎿嶄綔浜鸿鑹�(鍗囧崟缁撹处蹇呭～锛岄��娆句娇鐢�) */
+ private String opRoleId;
/**鏀粯鐢ㄦ埛*/
private String payUserId;
--
Gitblit v1.8.0