From 392cea950b79e5f7ca794296733b8f55bd23cd7b Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 23 八月 2023 18:48:15 +0800
Subject: [PATCH] Merge branch 'fhx-prod-订单升单' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java | 16 ++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 4 ++++
4 files changed, 26 insertions(+), 1 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 8390d10..ab7e1c9 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
@@ -28,4 +28,8 @@
private List<String> payMethodList;
/**浼樻儬鍒稿钩鍙�*/
private String platform;
+
+ /** 璁㈠崟鏍囪瘑 */
+ private String orderId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index a0a1f97..d6eed8b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -30,4 +30,7 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
+ /** 璁㈠崟鍗囧崟鍏宠仈鍒楄〃 */
+ private List<OrderRiseDto> orderRiseList;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java
new file mode 100644
index 0000000..2bbd2da
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+/**
+ * 璁㈠崟鍗囧崟鍏宠仈dto
+ * @USER: fhx
+ * @DATE: 2023/8/23
+ **/
+@Data
+public class OrderRiseDto {
+
+ /** 鍏宠仈璁㈠崟鏍囪瘑(OrdersTotal) */
+ private String assocOrderId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 60a9bc3..bee390c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -97,6 +97,8 @@
/**闈炲繀濉� 娲诲姩瑙勫垯鏍囪瘑闆嗗悎*/
private List<String> activityIds;
- /** 娌荤枟鍗昳d */
+ /** 娌荤枟鍗昳d(鐩墠娌＄敤) */
private String treatSingleId;
+ /** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
+ private String addWay;
}
--
Gitblit v1.8.0