From 50a746ef89c924da09363a101fd92c825e5aa7b6 Mon Sep 17 00:00:00 2001
From: wzh <zhuhaow@phiskin.com>
Date: 星期三, 03 八月 2022 15:33:20 +0800
Subject: [PATCH] 修改订单优惠券
---
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/UserCanUseCouponDto.java | 2 +-
phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java | 2 +-
phis-feign/src/main/java/com/hz/his/constant/CouponPlatformConstants.java | 22 ++++++++++++++++++++++
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/constant/CouponPlatformConstants.java b/phis-feign/src/main/java/com/hz/his/constant/CouponPlatformConstants.java
new file mode 100644
index 0000000..8c043c0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/constant/CouponPlatformConstants.java
@@ -0,0 +1,22 @@
+package com.hz.his.constant;
+
+/**
+ * 骞冲彴甯搁噺
+ *
+ * @Author: wzh
+ * @Date: 2022/08/02
+ * @Description:
+ */
+public class CouponPlatformConstants {
+ //棰勭害
+ public static String TYPE_PLATFORM_PHIS = "p-his";
+ //鑹惧績鑽�
+ public static String TYPE_PLATFORM_CRM = "crm";
+ //瀵煎尰
+ public static String TYPE_PLATFORM_GUIDE = "guide";
+ //his鍔╂墜
+ public static String TYPE_PLATFORM_HIS = "his";
+ public static String TYPE_PLATFORM_MA = "marketing_assistant";
+ /**棰嗗缓*/
+ public static String TYPE_PLATFORM_PHISKIN = "PhiSkin";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
index 9db72be..e63776f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java
@@ -12,7 +12,7 @@
@Data
public class OrderItemCouponDto {
/**鍟嗗搧绫诲瀷*/
- private Integer goodsType;
+ private String goodsType;
/**鍟嗗搧鏍囪瘑*/
private String goodsId;
/**sku鏍囪瘑*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
index daed734..31983d2 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCanUseCouponDto.java
@@ -20,6 +20,6 @@
private BigDecimal total;
/**婊¤冻浠舵暟*/
private Integer itemNum;
- /**鍟嗗搧瀵瑰簲鐨刪is鏍囪瘑*/
+ /**鍟嗗搧crm sku鏍囪瘑*/
private List<HisGoodsDto> hisGoodsDtoList;
}
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 39b0dd2..cddc55b 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
@@ -6,6 +6,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.OrderCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.money.*;
@@ -112,6 +113,12 @@
@PostMapping(value = "/user/can/use/coupon")
Result userCanUseCoupon(@RequestBody UserCanUseCouponDto userCanUseCouponDto);
+ /**
+ * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
+ */
+ @PostMapping(value = "/order/can/use/coupon")
+ Result orderCanUseCoupon(@RequestBody OrderCanUseCouponDto orderCanUseCouponDto);
+
/**
* 鑾峰彇鐢ㄦ埛澧炲�奸噾鍒楄〃
--
Gitblit v1.8.0