From c8d8e3a8e7dab21ce0b2fced62bbd18f77d31d19 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 24 八月 2022 17:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 7 ++-----
phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java | 25 +++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 8 +++++++-
5 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
index 24401df..09d8815 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsCanUseCouponDto.java
@@ -8,7 +8,7 @@
/**
* @author wzh
- * 鍟嗗搧鍙敤浼樻儬鍒告墿灞�
+ * 鍟嗗搧SKU鍙敤浼樻儬鍒告墿灞�
* */
@Data
public class GoodsCanUseCouponDto extends PageDto {
@@ -22,4 +22,6 @@
private String hisGoodType;
/**鍟嗗搧閲戦*/
private BigDecimal price;
+ /**鏁伴噺*/
+ private Integer num;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java
new file mode 100644
index 0000000..0fe5bfb
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/GoodsUsedCouponDto.java
@@ -0,0 +1,25 @@
+package com.hz.his.dto.user.coupon;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wzh
+ * 鍟嗗搧SPU鍙敤浼樻儬鍒告墿灞�
+ * */
+@Data
+public class GoodsUsedCouponDto extends PageDto {
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鍟嗗搧绫诲瀷*/
+ private Integer goodType;
+ /**his鍟嗗搧绫诲瀷*/
+ private String hisGoodType;
+ /**骞冲彴*/
+ private String platform;
+ /**sku鏍囪瘑*/
+ private List<GoodsCanUseCouponDto> goodsCanUseCouponDtoList;
+}
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 397418c..ec180ee 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
@@ -50,12 +50,18 @@
Result couponCount(@RequestParam("couponId") String couponId);
/**
- * 浼樻儬鍒镐娇鐢ㄦ儏鍐�
+ * 浼樻儬鍒镐娇鐢ㄦ儏鍐靛垪琛�
*/
@PostMapping(value = "/coupon/used/detail")
Result couponUsedDetail(@RequestBody CouponListDetailDto couponListDetailDto);
/**
+ * 鐢ㄦ埛浼樻儬鍒告儏鍐�
+ */
+ @PostMapping(value = "/coupon/number/detail")
+ Result couponNumberDetail(@RequestBody CouponListDetailDto couponListDetailDto);
+
+ /**
* 鐢ㄦ埛鏄惁棰嗗彇杩囧洟璐椿鍔ㄤ紭鎯犲埜
*/
@PostMapping(value = "/check/group/coupon")
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 8a98951..bfad3c8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -7,10 +7,7 @@
import com.hz.his.dto.user.UserLevelDto;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
-import com.hz.his.dto.user.coupon.GoodsCanUseCouponDto;
-import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
-import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
-import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.coupon.*;
import com.hz.his.dto.user.money.*;
import com.hz.his.dto.user.label.UserLabelDto;
import com.hz.his.dto.user.packages.UserPackageDto;
@@ -120,7 +117,7 @@
* 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒�
* */
@PostMapping(value = "/goods/can/use/coupon")
- Result goodsCanUseCoupon(@RequestBody GoodsCanUseCouponDto goodsCanUseCouponDto);
+ Result goodsCanUseCoupon(@RequestBody GoodsUsedCouponDto goodsUsedCouponDto);
/**
* 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
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 a638ca7..b99219d 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
@@ -38,4 +38,10 @@
@PostMapping(value = "/coupon/get/Coupon")
Result getCoupon(@RequestBody CouponDto dto);
+ /**
+ * 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛浼樻儬鍒�
+ */
+ @PostMapping(value = "/coupon/invalid/user/coupon")
+ Result invalidCouponNumber(@RequestBody CouponDto couponDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0