From 50435810ba607fd87848126567861a2def3a1f95 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期四, 08 九月 2022 14:47:28 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java | 3 +++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 2 ++
phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java | 4 ++++
phis-feign/src/main/java/com/hz/phis/dt/spec/SkuGroupSpecDt.java | 18 ++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 4 ++--
6 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
index 926de3e..85d1234 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java
@@ -38,8 +38,8 @@
}
public Integer getPageSize() {
- if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 500){
- this.pageSize = 500;
+ if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
+ this.pageSize = 800;
}
return this.pageSize;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
index deaa482..d70d3bb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -107,6 +107,9 @@
/* 鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙栫郴缁熷鐞� 0 鐢ㄦ埛棰嗗彇 1*/
private Integer opType;
+ /*鏄惁闇�瑕侀鍙� 0 鍚� 1 鏄� 榛樿闇�瑕侀鍙�*/
+ private Integer isReceiveValueAddedFund;
+
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
index 5c73e16..d601adf 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -42,4 +42,11 @@
* */
@PostMapping(value = "/user/money/info")
Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+
+ /**
+ * 璁剧疆澧炲�奸噾鏄惁闇�瑕佺敤鎴烽鍙栫姸鎬�
+ * */
+ @PostMapping(value = "/user/money/unclaimed/default/setting")
+ Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java
index f9ac36b..fc0185c 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/project/ProjectDetailBo.java
@@ -1,6 +1,8 @@
package com.hz.phis.dt.project;
import com.hz.phis.dt.BaseDt;
+import com.hz.phis.dt.spec.SkuGroupSpecDt;
+import com.hz.phis.dt.spec.SkuSpecDt;
import lombok.Data;
import java.math.BigDecimal;
@@ -29,6 +31,8 @@
private List<ProjectSpecsBo> projectSpecsBoList;
/**sku淇℃伅*/
private List<String> skuIdList;
+ /**sku瑙勬牸淇℃伅*/
+ private List<SkuGroupSpecDt> skuSpecsBoList;
/**瑙勬牸*/
private String specification;
/**鍏朵粬瑙勬牸*/
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuGroupSpecDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuGroupSpecDt.java
new file mode 100644
index 0000000..3575e8a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuGroupSpecDt.java
@@ -0,0 +1,18 @@
+package com.hz.phis.dt.spec;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 椤圭洰sku杩斿洖鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class SkuGroupSpecDt {
+
+ /**椤圭洰sku鏍囪瘑*/
+ private String projectId;
+
+ private List<SkuSpecDt> valueList;
+}
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 906cd91..ce36a28 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
@@ -69,4 +69,6 @@
private String email;
/**澶村儚*/
private String imgUrl;
+
+ private String userBelongingType;
}
--
Gitblit v1.8.0