From 20d80bc12cf6a2efda1e8b0d7fe77578fc41bab1 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 24 八月 2023 11:05:29 +0800
Subject: [PATCH] Merge branch 'fhx-prod-订单升单' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponCheckDto.java | 2 ++
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 | 4 ++--
3 files changed, 11 insertions(+), 2 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 ab7e1c9..c5d7609 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
@@ -29,7 +29,7 @@
/**浼樻儬鍒稿钩鍙�*/
private String platform;
- /** 璁㈠崟鏍囪瘑 */
- private String orderId;
+ /** 璁㈠崟鏍囪瘑List */
+ private List<String> orderIdList;
}
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