From 2d12c1e7182a0cf34d96536662bb3ca60afe4c0c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 27 五月 2024 17:57:47 +0800
Subject: [PATCH] Merge branch 'fhx-prod-复购活动' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java | 28 +++++
phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java | 20 ++++
phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java | 49 +++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java | 42 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 4
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java | 56 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java | 8 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 6 +
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java | 24 ++++
10 files changed, 240 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java b/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java
new file mode 100644
index 0000000..9a88017
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java
@@ -0,0 +1,49 @@
+package com.hz.his.constant;
+
+import com.hx.util.StringUtils;
+
+/**
+ * 娲诲姩浼樻儬绫诲瀷
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+public class ActivityPreferentialConstants {
+
+ /** 浼樻儬绫诲瀷 - 闄嶄环 */
+ public static final String TYPE_PRICE_REDUCTION = "price_reduction";
+ /** 浼樻儬绫诲瀷 - 璧犻�佷紭鎯犲埜 */
+ public static final String TYPE_GIFT_COUPON = "gift_coupon";
+ /** 浼樻儬绫诲瀷 - 璧犻�佺Н鍒� */
+ public static final String TYPE_GIFT_INTEGRAL = "gift_integral";
+ /** 浼樻儬绫诲瀷 - 鎶樻墸 */
+ public static final String TYPE_DISCOUNT = "discount";
+ /** 浼樻儬绫诲瀷 - 璧犻�侀」鐩� */
+ public static final String TYPE_GIFT_PROJECT = "gift_project";
+
+
+ /** 杞崲浼樺寲绫诲瀷涓枃 */
+ public static String changeTypeCn(String type){
+ switch (type){
+ case TYPE_PRICE_REDUCTION: return "闄嶄环";
+ case TYPE_GIFT_COUPON: return "璧犻�佷紭鎯犲埜";
+ case TYPE_GIFT_INTEGRAL: return "璧犻�佺Н鍒�";
+ case TYPE_DISCOUNT: return "鎵撴姌";
+ case TYPE_GIFT_PROJECT: return "璧犻�侀」鐩�";
+ default: return "鏈煡";
+ }
+ }
+
+ /** 妫�鏌ュ垽鏂槸鍚﹁禒閫佺被鍨� */
+ public static boolean checkGiftType(String type){
+ if(StringUtils.isEmpty(type)){
+ return false;
+ }
+
+ if(TYPE_GIFT_COUPON.equals(type)
+ || TYPE_GIFT_INTEGRAL.equals(type)
+ || TYPE_GIFT_PROJECT.equals(type)){
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java
new file mode 100644
index 0000000..f6e80a9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.activity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 澶嶈喘娲诲姩dto
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+@Data
+public class RepoActivityDto {
+
+ /** 澶嶈喘娲诲姩id */
+ private String activityId;
+ /** 鐢ㄦ埛id */
+ private String userId;
+ /** 闄愬埗鐢ㄦ埛浼氬憳绛夌骇(澶氫釜閫楀彿鍒嗛殧锛岀┖鍒欎笉闄愬埗) */
+ private String limitVipLevel;
+ /** 闄愬埗闂ㄥ簵id */
+ private List<String> limitShopIdList;
+ /** 闄愬埗鍘嗗彶璐拱杩噑puId */
+ private List<String> limitSpuIdList;
+ /** 闄愬埗鍘嗗彶鍒嗙被(椤圭洰鏄犲皠琛�) */
+ private List<RepoActivityLimitDto> limitTypeList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java
new file mode 100644
index 0000000..0765a7e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityLimitDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.activity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 澶嶈喘娲诲姩闄愬埗dto
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+@Data
+public class RepoActivityLimitDto {
+
+ /** 鏄犲皠妯″潡 */
+ private Integer moduleType;
+ /** 鏄犲皠鍚嶇О */
+ private String itemName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
index 799d2b1..2760d5a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponNumberDto.java
@@ -17,6 +17,7 @@
public class CouponNumberDto{
/**鏍囪瘑*/
private String id;
+
/**鏍囬*/
private String title;
/**鏈夋晥寮�濮嬫椂闂�*/
@@ -58,6 +59,13 @@
/**璁℃椂绫诲瀷锛�0鏃堕棿娈碉紝1棰嗗彇鏈夋晥鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級锛�2鏃犳晥鏃堕暱锛�*/
private Integer timeType;
+ /** 浼樻儬鍒竔d */
+ private String couponId;
+ /** 浼樻儬鍒告爣棰� */
+ private String couponTitle;
+ /** 浼樻儬鍒哥爜id */
+ private String couponNumberId;
+
/**璁℃椂绫诲瀷-鏃堕棿娈�*/
public static final int TIME_TYPE_SLOT = 0;
/**璁℃椂绫诲瀷-棰嗗彇鏃堕暱锛堥鍙栨椂闂村彔鍔犳椂闂达級*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index cef0e81..79d8a0e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -26,6 +26,10 @@
private BigDecimal discount;
/**褰撳墠鏄惁鍏佽浣庡垎鎶垫墸鐜伴噾*/
private Boolean isCanUseIntegralCash = false;
+ /** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal couponTotal;
+ /** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal preferentialTotal;
/**鎶垫墸鐜伴噾閲戦*/
private BigDecimal cash = BigDecimal.ZERO;
/**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
@@ -63,4 +67,6 @@
/** 璇夋眰鍒嗙被idList */
private List<String> appealTypeIdList;
+ /** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */
+ private List<OrderItemPreferentialDto> orderItemPreferentialList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java
new file mode 100644
index 0000000..5fabdb9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java
@@ -0,0 +1,56 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟瀛愬崟鍟嗗搧鍏宠仈鐨勪紭鎯犳椿鍔�
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+@Data
+public class OrderItemPreferentialDto {
+
+ /** 璁㈠崟id锛圤rdersTotal锛� */
+ private String orderId;
+ /** 涓�绾у瓙璁㈠崟id锛圤rderItem锛� */
+ private String orderItemId;
+
+ /** 浼樻儬娲诲姩鍚嶇О */
+ private String name;
+ /** 鏉ユ簮绫诲瀷 */
+ private String sourceType;
+ /** 鏉ユ簮鏍囪瘑 */
+ private String sourceId;
+
+ /** 杈呭姪瀛楁1 */
+ private String common1Id;
+ /** 杈呭姪瀛楁2 */
+ private String common2Id;
+ /** 杈呭姪鏁板�� */
+ private Integer commonNum;
+
+ /** 娲诲姩绫诲瀷(ActivityPreferentialConstants) */
+ private String type;
+
+ /** 浼樻儬鏁板�� */
+ private BigDecimal valNum;
+ /** 璧犻�佷紭鎯爅son */
+ private String giftJson;
+
+ /** 浼樻儬璁＄畻鎺掑簭 */
+ private Integer sortNum;
+ /** 浼樻儬鍓嶄环鏍� */
+ private BigDecimal beforePrice = BigDecimal.ZERO;
+ /** 浼樻儬鍚庝环鏍� */
+ private BigDecimal afterPrice = BigDecimal.ZERO;
+ /** 浼樻儬浠锋牸(浼樻儬鍓�-浼樻儬鍚�) */
+ private BigDecimal preferentialPrice = BigDecimal.ZERO;
+
+
+ ////////////////////////////////////////////////////////////////////////////////////////////
+
+ public OrderItemPreferentialDto() {
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 196d775..97b8d87 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto.order;
+import com.hz.his.dto.refund.RefundPreferentialDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -78,4 +79,7 @@
//闈炲繀濉� 閲嶅彂鏍囪瘑
private String resendRecordId;
+ /** 閫�娆句紭鎯� */
+ private RefundPreferentialDto refundPreferentialDto;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java
new file mode 100644
index 0000000..82169a8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/refund/RefundPreferentialDto.java
@@ -0,0 +1,24 @@
+package com.hz.his.dto.refund;
+
+import com.hz.his.dto.coupon.CouponNumberDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 閫�娆句紭鎯燿to
+ * @USER: fhx
+ * @DATE: 2024/5/15
+ **/
+@Data
+public class RefundPreferentialDto {
+
+ /** 瑕侀��娆剧殑澶嶈喘娲诲姩璧犻�佺Н鍒� */
+ private BigDecimal refundRepoGiftIntegral;
+ /** 瑕侀��娆句綔搴熺殑澶嶈喘娲诲姩璧犻�佷紭鎯犲埜 */
+ private List<CouponNumberDto> refundRepoGiftCouponList;
+ /** 宸蹭娇鐢ㄤ紭鎯犲埜鎻愮ず */
+ private List<String> couponTipsList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java
new file mode 100644
index 0000000..c2f2e0e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java
@@ -0,0 +1,42 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.activity.RepoActivityDto;
+import com.hz.his.dto.coupon.CouponDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * 澶嶈喘娲诲姩service
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "repo-activity")
+public interface SRepoActivityService {
+
+ /** 闂ㄥ簵鍒楄〃 */
+ @PostMapping(value = "/repo/activity/shop/list")
+ Result shopList();
+
+ /** SPU鍒楄〃 */
+ @PostMapping(value = "/repo/activity/spu/list")
+ Result spuList(@RequestBody PageDto dto);
+
+ /** 椤圭洰鏄犲皠鍒嗙被鍒楄〃 */
+ @PostMapping(value = "/repo/activity/project/type/relation/list")
+ Result projectTypeRelationList(@RequestBody PageDto dto);
+
+ /** 浼樻儬鍒稿垪琛� */
+ @PostMapping(value = "/repo/activity/coupon/list")
+ Result couponList(@RequestBody CouponDto couponDto);
+
+ /** 妫�鏌ユ煡璇㈢敤鎴锋槸鍚︾鍚堝弬涓庡璐椿鍔� */
+ @PostMapping(value = "/repo/activity/check/user/can/join")
+ Result checkUserCanJoin(@RequestBody RepoActivityDto repoActivityDto);
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index 970d425..3cfa716 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -186,5 +186,7 @@
@PostMapping(value = "/order/countOrderShouldTotal")
Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);
-
+ /** 閫�娆惧墠閫昏緫妫�鏌� */
+ @PostMapping(value = "/order/reufnd/afrer/check")
+ Result refundAfterCheck(@RequestBody OrderRefundDto dto);
}
\ No newline at end of file
--
Gitblit v1.8.0