From 56916ad8f99405499f63833f26021b4c92188490 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 07 六月 2024 15:21:49 +0800
Subject: [PATCH] 爆款活动优化
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 6 +++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java | 12 +++---
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | 7 +--
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java | 25 +++++++-----
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityCountVo.java | 21 ++++++++++
5 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index 242077d..1698b62 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -20,6 +20,8 @@
private String commonItemId;
/**鍏叡绫诲瀷*/
private String commonType;
+ /**鏉ユ簮鏍囪瘑*/
+ private String sourceId;
/**鍏叡鏍囪瘑绫诲瀷,鍏呭�艰鍗曟爣璇�*/
public static String TYPE_COMMON_ORDER_RECHARGE = "recharge";
@@ -45,4 +47,8 @@
public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
/**鍏叡鏍囪瘑绫诲瀷,鐖嗘娲诲姩棰嗗彇 */
public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity";
+ /**鍏叡鏍囪瘑绫诲瀷,鐖嗘娲诲姩鍒嗕韩璧犻�� */
+ public static String TYPE_COMMON_BURST_ACTIVITY_SHARE = "burst_activity_share";
+ /**鍏叡鏍囪瘑绫诲瀷,鐖嗘娲诲姩瑙勫垯璧犻�� */
+ public static String TYPE_COMMON_BURST_ACTIVITY_RULE = "burst_activity_rule";
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
index 44906a1..a225a8e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
@@ -1,13 +1,11 @@
package com.hz.his.feign.service.phis;
import com.hx.resultTool.Result;
+import com.hz.phis.vo.order.OrderActivityCountVo;
import com.hz.phis.vo.order.OrderActivityVo;
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.RequestParam;
-
-import java.math.BigDecimal;
/**璁㈠崟娲诲姩鏌ヨ
* @author CJH
@@ -16,7 +14,7 @@
public interface SOrderActivityService {
/**
- * 鏍规嵁娲诲姩缂栫爜鏌ヨ璁㈠崟鏄惁宸茬粡鎵ц
+ * 鏍规嵁娲诲姩缂栫爜鏌ヨ鏄惁鎵ц+鏄惁娑堣垂+璧犻�佹暟鎹�
* @param orderActivityVo 瀵硅薄
* @return Result 浣跨敤OrderActivityReturnVo杞寲
*/
@@ -24,9 +22,11 @@
Result getActivityExecute(@RequestBody OrderActivityVo orderActivityVo);
/**
- * 鏍规嵁娲诲姩缂栫爜鏌ヨ璧犻�佺殑澧炲�奸噾
+ * 鑾峰彇鐢ㄦ埛娲诲姩杩旇禒鐨勬暟鎹�
+ * @param orderActivityVo 瀵硅薄
+ * @return Result 浣跨敤OrderActivityReturnVo杞寲
*/
@PostMapping(value = "/order/activity/increment/money")
- Result getActivityReturn(@RequestBody OrderActivityVo orderActivityVo);
+ Result getActivityReturn(@RequestBody OrderActivityCountVo orderActivityVo);
}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityCountVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityCountVo.java
new file mode 100644
index 0000000..174aa8c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityCountVo.java
@@ -0,0 +1,21 @@
+package com.hz.phis.vo.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author fwq
+ */
+@Data
+public class OrderActivityCountVo {
+ /**鐢ㄦ埛hisId-蹇呭～*/
+ private String userId;
+ /**鍙備笌鐨勬椿鍔�*/
+ private List<String> codeList;
+ /**閲戦鐨勬潵婧愮被鍨�*/
+ private String operationReason;
+ /**浼樻儬鍒告潵婧愮被鍨�(CouponRecordDto)*/
+ private String couponType;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
index df2114e..0b3377a 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
@@ -13,12 +13,11 @@
private Integer isExecute = 0;
/**鏄惁宸蹭笅鍗�*/
private Integer isOrder = 0;
-
- /**杩旇禒鐨勫鍊奸噾*/
+ /**澧炲�奸噾*/
private BigDecimal incrementMoney = BigDecimal.ZERO;
- /**杩旇禒鐨勭Н鍒�*/
+ /**绉垎*/
private BigDecimal integralMoney = BigDecimal.ZERO;
- /**杩旇禒鐨勪紭鎯犲埜鏁伴噺*/
+ /**浼樻儬鍒告暟閲�*/
private Integer couponNum = 0;
/**閭�璇风殑浜烘暟*/
private Integer inviteeNum = 0;
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
index f9aa785..aab61db 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
@@ -2,24 +2,27 @@
import lombok.Data;
-import java.util.List;
-
/**
* @author CJH
*/
@Data
public class OrderActivityVo {
- /**娲诲姩椤甸潰绫诲瀷-鎸囧畾璁㈠崟鏍囪瘑*/
- private String orderId;
- /**娲诲姩椤甸潰绫诲瀷-鍙┖*/
- private Integer activityPageType;
- /**娲诲姩鍖哄垎缂栧彿-蹇呭～*/
- private String activityPageCode;
- /**his鐢ㄦ埛-蹇呭～*/
+ /**鐢ㄦ埛hisId-蹇呭～*/
private String userId;
+ /**閭�璇蜂汉hisId*/
private String inviteeUserId;
+ /**娲诲姩鍖哄垎缂栧彿*/
+ private String activityPageCode;
+
+ /**鏌ヨ娑堣垂鍜屾墽琛�*/
+ private Boolean selectJoin = false;
+ /**鏌ヨ閲戦*/
+ private Boolean selectMoney = false;
/**閲戦鐨勬潵婧愮被鍨�*/
private String operationReason;
- /**杩旇禒閲戦鍙備笌鐨勬椿鍔�*/
- private List<String> codeList;
+ /**鏌ヨ浼樻儬鍒�*/
+ private Boolean selectCoupon = false;
+ /**浼樻儬鍒告潵婧愮被鍨�(CouponRecordDto)*/
+ private String couponType;
+
}
--
Gitblit v1.8.0