From cd125a938ef269c4204637625de0b3ba72d931ff Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 06 六月 2024 12:02:44 +0800
Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 6 +-
phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java | 44 ++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/PaySendItemDto.java | 19 +++++++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 13 +-----
5 files changed, 70 insertions(+), 14 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 2234f92..242077d 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
@@ -43,6 +43,6 @@
public static final String TYPE_COMMON_DRAW = "draw";
/**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
- /**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
+ /**鍏叡鏍囪瘑绫诲瀷,鐖嗘娲诲姩棰嗗彇 */
public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 0135be3..5ecf215 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -59,17 +59,10 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
- /**璧犻�佸埌璐︾敤鎴�-锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
- private String giveIncreaseUserId;
- /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
- private BigDecimal giveIncrease;
- /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
- private String giveIncreaseId;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
- private String giveIncreaseTitle;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
- private String giveIncreaseInfo;
/**闈炲繀濉� 鍙互鍙備笌绉垎鎶垫墸缁撹处鐨勫晢鍝佹爣璇�*/
private List<String> canIntegralCashIdList;
+ /**缁撹处鍚庤禒閫�*/
+ private PaySendDto paySendDto;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java
new file mode 100644
index 0000000..4d0edb9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PaySendDto.java
@@ -0,0 +1,44 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 璧犻�佽鎯�
+ */
+@Data
+public class PaySendDto {
+
+ /**璧犻�佸埌璐︾敤鎴�*/
+ private String userId;
+
+ /**澧炲�奸噾*/
+ private BigDecimal incrementMoney = BigDecimal.ZERO;
+ /**澧炲�奸噾璧犻�佸埌璐﹁鍒欙紙MoneyRule锛�*/
+ private String incrementRuleId;
+ /**澧炲�奸噾璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
+ private String incrementTitle;
+ /**澧炲�奸噾璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
+ private String incrementInfo;
+
+// /**绉垎*/
+// private BigDecimal integralMoney = BigDecimal.ZERO;
+// /**绉垎璧犻�佸埌璐﹁鍒欙紙MoneyRule锛�*/
+// private String integralRuleId;
+// /**绉垎璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
+// private String integralTitle;
+// /**绉垎璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
+// private String integralInfo;
+
+ /**浼樻儬鍒�*/
+ private List<PaySendItemDto> couponList;
+ /**浼樻儬鍒歌禒閫佽鍒�*/
+ private String couponRuleId;
+ /**浼樻儬鍒歌禒閫佽鍒欏悕*/
+ private String couponRuleName;
+ /**浼樻儬鍒歌禒閫佸娉�*/
+ private String couponRemarks;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PaySendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PaySendItemDto.java
new file mode 100644
index 0000000..1fad2a5
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PaySendItemDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+/**
+ * 閫氱敤璧犻�佹暟鎹�
+ */
+@Data
+public class PaySendItemDto {
+
+ /**鏍囪瘑*/
+ private String id;
+ /**鍚嶇О*/
+ private String name;
+ /**鏁伴噺*/
+ private Integer num = 0;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index a1a41fb..3faa1ea 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -2,9 +2,6 @@
import lombok.Data;
-import lombok.ToString;
-
-import java.math.BigDecimal;
/**
* 淇敼鐢ㄦ埛璧勯噾
@@ -47,6 +44,9 @@
/**澶囨敞*/
private String remarks;
+ /**閲戦瑙勫垯*/
+ private String moneyRuleId;
+
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**鎿嶄綔浜虹被鍨�-绯荤粺*/
--
Gitblit v1.8.0