From 1a40457346f9f48590d5a76dfededb33fc3e20b1 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 04 九月 2023 15:24:57 +0800
Subject: [PATCH] Merge branch 'fhx-prod-订单升单' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRiseDto.java | 16 ++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderConsumePayDto.java | 37 ++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 3 +
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 4 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 7 +++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java | 6 +++
8 files changed, 76 insertions(+), 1 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 64111b7..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
@@ -20,6 +20,8 @@
/**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
private List<String> payMethodList;
+ /** 妫�鏌ヤ紭鎯犲埜鐮佹槸鍚﹀凡琚娇鐢紝榛樿ture妫�鏌ワ紝鍗囧崟鏄痜alse涓嶆鏌� */
+ private boolean checkCouponNumberIsUse = true;
/**鍟嗗搧鎬婚噾棰�(鏆傛棤鐢�-涓嶄紶)*/
private BigDecimal total;
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..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
@@ -28,4 +28,10 @@
private List<String> payMethodList;
/**浼樻儬鍒稿钩鍙�*/
private String platform;
+
+ /** 璁㈠崟鏍囪瘑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/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;
}
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 a8b6967..210a568 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;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index a7eac39..dc62742 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -116,6 +116,13 @@
Result userCouponCheckList(@RequestBody(required = false) CouponListDto couponListDto);
/**
+ * 鐢ㄦ埛-鍗囧崟璁㈠崟鐨勫師浣跨敤浼樻儬鍒稿垪琛�
+ * @return canUseCouponList鍙敤鍒稿垪琛� canUseCount鍙敤鍒告暟閲�
+ * */
+ @PostMapping(value = "/coupon/user/riseOrderOriCouponList")
+ Result riseOrderOriCouponList(@RequestBody(required = false) CouponListDto couponListDto);
+
+ /**
* 鏍规嵁skuid鏌ヨ鍏宠仈浼樻儬鍒�
*/
@PostMapping(value = "/coupon/find/skuId")
--
Gitblit v1.8.0