From 807247d2fd99fd5d51f3589695785c21762eb197 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期二, 03 一月 2023 17:38:30 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 5 +++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 4 ++++
3 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 015c101..b3ea858 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -33,5 +33,9 @@
/**浼樻儬鍒告爣璇�*/
private String couponId;
+ /**鍙戞斁浼樻儬鍒稿弬鏁�-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /*鐢ㄦ埛浼樻儬鍒�*/
+ private String couponNumberId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 9f20bc0..2442316 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -1,5 +1,7 @@
package com.hz.his.dto.order;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -34,4 +36,9 @@
/**鏄惁纭璁㈠崟*/
private Integer isCustomerConfirm;
+ /**澶勬柟璁㈠崟鍙�*/
+ private String prescriptionNo;
+ /**澶勬柟璁㈠崟id*/
+ private String prescriptionId;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index b99219d..edd3c19 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -44,4 +44,9 @@
@PostMapping(value = "/coupon/invalid/user/coupon")
Result invalidCouponNumber(@RequestBody CouponDto couponDto);
+ /**
+ * 寮�鏀惧钩鍙�-妫�鏌ヤ紭鎯犲埜鏄惁鍙敤
+ */
+ @PostMapping(value = "/coupon/check/coupon")
+ Result checkCoupon(@RequestBody CouponDto couponDto);
}
\ No newline at end of file
--
Gitblit v1.8.0