From 04c7ad9c89002913dd4d906d7701391d0a0c5398 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 06 六月 2024 18:24:56 +0800
Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java | 6 ++++++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 6 ++++++
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java | 14 +++++++++++++-
phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java | 3 +++
4 files changed, 28 insertions(+), 1 deletions(-)
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 68b65fa..e08d0e7 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
@@ -23,4 +23,10 @@
@PostMapping(value = "/order/activity/execute")
Result getActivityExecute(@RequestBody OrderActivityVo orderActivityVo);
+ /**
+ * 鏍规嵁娲诲姩缂栫爜鏌ヨ璧犻�佺殑澧炲�奸噾
+ */
+ @PostMapping(value = "/order/activity/increment/money")
+ Result getActivityIncrement(@RequestBody OrderActivityVo orderActivityVo);
+
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index 0d542e8..a5d985d 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -78,8 +78,12 @@
private String nurseCorpUserId;
//绗竴娆″埌搴楁椂闂�
private Date firstArriveTime;
+ //鏈�鍚庝竴娆″埌搴楁椂闂�
+ private Date lastArriveTime;
//绗竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
private Date firstPayOrderTime;
+ //鏈�鍚庝竴娆′笅鍗曟椂闂�(缁撹处鎴愬姛鐨勬椂闂�)
+ private Date lastPayOrderTime;
//鏈�鍚庝竴娆℃墽琛屾椂闂�
private Date lastDeductionTime;
//openId
@@ -88,6 +92,8 @@
private String gzhOpenId;
//鏄惁鍚湁鐑帥鍚夐」鐩�
private Boolean isHaveRmj = false;
+ //娑堣垂鐜伴噾
+ private BigDecimal cashTotal = BigDecimal.ZERO;
/** 鎵�灞為【闂悕绉� */
private String adviserName;
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 294892a..191f9ec 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
@@ -2,11 +2,23 @@
import lombok.Data;
+import java.math.BigDecimal;
+
/**
* @author CJH
*/
@Data
public class OrderActivityReturnVo {
/**娲诲姩鐨勮鍗曟槸鍚﹀凡鎵ц锛�0鍚�1鏄�*/
- private Integer isExecute;
+ private Integer isExecute = 0;
+ /**鏄惁宸蹭笅鍗�*/
+ private Integer isOrder = 0;
+
+ /**杩旇禒鐨勫鍊奸噾*/
+ private BigDecimal incrementMoney = BigDecimal.ZERO;
+ /**杩旇禒鐨勭Н鍒�*/
+ private BigDecimal integralMoney = BigDecimal.ZERO;
+ /**閭�璇风殑浜烘暟*/
+ 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 7f47b21..bf822d6 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
@@ -15,4 +15,7 @@
private String activityPageCode;
/**his鐢ㄦ埛-蹇呭～*/
private String userId;
+ private String inviteeUserId;
+ /**閲戦鐨勬潵婧愮被鍨�*/
+ private String operationReason;
}
--
Gitblit v1.8.0