From b3e46dc66eccee594814a3a71845483c6de570ca Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 05 七月 2023 10:08:23 +0800
Subject: [PATCH] Merge branch 'fwq-通用审核接口' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 2
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java | 17 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java | 5 +
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java | 32 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 6 +
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java | 16 ++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java | 20 +++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 6 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 12 +++
phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java | 15 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 11 ++
phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java | 13 +++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 29 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java | 9 ++
phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java | 12 +++
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java | 24 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 5 +
18 files changed, 240 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java
new file mode 100644
index 0000000..5c7c17b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignReturnVo.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**鐢熸垚绛惧悕璁块棶URL
+ * @author CJH*/
+@Data
+public class FileSignReturnVo {
+
+ /**鏂囦欢璺緞*/
+ private String fileUrl;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
new file mode 100644
index 0000000..8c82c2f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/file/FileSignVo.java
@@ -0,0 +1,15 @@
+package com.hz.his.dto.file;
+
+import lombok.Data;
+
+/**鐢熸垚绛惧悕璁块棶URL
+ * @author CJH*/
+@Data
+public class FileSignVo {
+
+ /**鏂囦欢璺緞*/
+ private String fileUrl;
+ /**妗跺悕绉�-鍙笉浼�*/
+ private String bucketName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java
new file mode 100644
index 0000000..18b1352
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingContentDto {
+ /**灞曠ず鍐呭閿�煎*/
+ private List<MarketingMsgItemDto> contentList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java
new file mode 100644
index 0000000..d1305d8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingMsgDto {
+
+ /*******************蹇呭～椤�*************************/
+ /** 鏄惁鏀惧ぇ绗竴涓猚ontent_item锛岄粯璁rue*/
+ private Boolean emphasisFirstItem = true;
+ /** 娑堟伅鍐呭閿�煎锛屾渶澶氬厑璁�10涓猧tem -蹇呭～椤�*/
+ private List<MarketingMsgItemDto> contentItem;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java
new file mode 100644
index 0000000..5c3b700
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingMsgItemDto {
+ /**濡傛灉鏄彂閫佺殑娑堟伅锛氶暱搴�10涓眽瀛椾互鍐� -蹇呭～椤�*/
+ private String key;
+ /**濡傛灉鏄彂閫佺殑娑堟伅锛� 闀垮害30涓眽瀛椾互鍐� -蹇呭～椤�*/
+ private String value;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java
new file mode 100644
index 0000000..81fef17
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍥炶皟鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingReturnDto{
+
+ /**瀹℃牳缁撴灉 agree涓洪�氳繃,reject涓轰笉閫氳繃*/
+ public static final String AGREE = "agree";
+ public static final String REJECT = "reject";
+ /**瀹℃牳缁撴灉*/
+ private String result;
+ /**杩斿洖淇℃伅*/
+ private String resultMsg;
+ /**鍞竴鏍囪瘑*/
+ private String uniqueId;
+ /**瀹℃牳鏍囪瘑*/
+ private String applyId;
+ /**瀹℃牳浜烘爣璇�*/
+ private String opId;
+ /**瀹℃牳浜哄悕绉�*/
+ private String opMan;
+ /**瀹℃牳鎰忚*/
+ private String applyRemarks;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
new file mode 100644
index 0000000..e421cb2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.marketing.common;
+
+import com.hz.his.dto.marketing.MarketingDto;
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍏叡鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingTotalDto extends MarketingDto {
+
+ /******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
+
+ /**瀹℃牳绫诲瀷 >20鐨勫��*/
+ private Integer type;
+ /**瀹℃牳鍞竴鏍囪瘑*/
+ private String uniqueId;
+
+ /**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
+ private MarketingContentDto marketingContentDto;
+
+ /**娑堟伅鍙戦�佸唴瀹� -蹇呭～椤�*/
+ private MarketingMsgDto marketingMsgDto;
+
+ /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟浼犲弬*/
+ private String callbackUrl;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
index cb909f0..27b5038 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/DeductionSurfaceDto.java
@@ -14,6 +14,10 @@
private Date startTime;
/**寮�鍗曠粨鏉熸椂闂�*/
private Date endTime;
+ /**璁㈠崟鏀粯寮�濮�*/
+ private Date orderPayStartTime;
+ /**璁㈠崟鏀粯缁撴潫*/
+ private Date orderPayEndTime;
/**璁㈠崟鍙�*/
private String orderNo;
/**鎵�灞為棬搴�*/
@@ -24,6 +28,14 @@
private Integer deductionStatus;
/**椤圭洰鍒嗙被*/
private String typeId;
+ /**鍝侀」鍒嗙被*/
+ private String goodsClassify;
+ /**鏈堜唤鏃堕棿*/
+ private String monthTime;
+ /**鏈堜唤鏃堕棿寮�濮�*/
+ private String startMonthTime;
+ /**鏈堜唤鏃堕棿缁撴潫*/
+ private String endMonthTime;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
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 d52c540..2574514 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
@@ -95,4 +95,6 @@
public static final String OPERATION_REASON_CHANGE = "changeGoods";
/**鎿嶄綔鏂瑰紡-鐢熸棩璧犻��*/
public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift";
+
+ public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
new file mode 100644
index 0000000..16bc710
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.marketing;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 钀ラ攢鍔╂墜瀹℃牳鎺ュ彛
+ */
+@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m-common")
+public interface MCommonService {
+
+ /**
+ * 缁熶竴鐢宠瀹℃牳鎺ュ彛
+ */
+ @PostMapping(value = "/common/apply")
+ Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto);
+
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
index ed9dc06..b927907 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.file.FileDownDto;
+import com.hz.his.dto.file.FileSignVo;
import feign.Response;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
@@ -46,4 +47,12 @@
@PostMapping(value = "/cos/download-file")
Response downloadFile(@RequestBody FileDownDto cosDownDto);
+ /**
+ *鐢熸垚绛惧悕璁块棶URL
+ * @param fileSignVo 瀵硅薄
+ * @return 浣跨敤FileSignReturnVo杞寲
+ */
+ @PostMapping(value = "/cos/signUrl")
+ Response downloadFile(@RequestBody FileSignVo fileSignVo);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 43f1542..ab4bd11 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -307,4 +307,16 @@
* */
@PostMapping(value = "/user/check/upgraded/aesthetics")
Result checkUpgradedAesthetics(@RequestBody UserDto userDto);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁涓哄啀鍗囩編瀛︿細鍛橈紙鏄惁鏈夎喘涔板啀鍗囩編瀛﹀崱椤硅鍗曪級
+ * */
+ @PostMapping(value = "/user/check/consumption")
+ Result checkConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛绱杩斾剑
+ * */
+ @PostMapping(value = "/user/rebate/userId")
+ Result queryRebateByUserId(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
index a76d5a6..743ccb4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -32,4 +32,15 @@
@PostMapping(value = "/user/money/info")
Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾鏉ユ簮淇℃伅(鏃ュ織娑堟伅鏌ヨ)
+ */
+ @PostMapping(value = "/user/money/log/source/info")
+ Result userMoneyLogSourceInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾浣跨敤淇℃伅(鏃ュ織娑堟伅鏌ヨ)
+ */
+ @PostMapping(value = "/user/money/log/use/info")
+ Result userMoneyLogUseInfo(@RequestBody UserMoneyDto userMoneyDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index a1816d4..074a4f0 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -96,4 +96,10 @@
*/
@PostMapping(value = "/user/families/room/info/update")
Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁＄畻
+ */
+ @PostMapping(value = "/user/level/calc")
+ Result userLevelCalc(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index e918438..85d552e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -94,5 +94,10 @@
@PostMapping("/admin/consultant/report/user/doctor/deduction/list")
Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鍜ㄨ甯�-鍖荤敓鎵ц鍗犳瘮鏁版嵁鍒楄〃-鏈堢粺璁�
+ */
+ @PostMapping("/admin/consultant/report/user/doctor/deduction/list/month")
+ Result userDoctorDeductionMonthList(@RequestBody EmployeeReportDto employeeReportDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
index 17fc49a..b3e6641 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDeductionService.java
@@ -21,5 +21,10 @@
@PostMapping("/deduction/surface/list")
Result surfaceList(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 鏈墽琛屾槑缁嗗揩鐓у垪琛�
+ */
+ @PostMapping("/deduction/surface/list/data")
+ Result surfaceListData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
index 908aac6..2f55d29 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -83,4 +83,10 @@
@PostMapping("/admin/export/shop/user/doctor/deduction/list")
Result userDoctorDeductionList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 闂ㄥ簵-鍖荤敓鎵ц鍗犳瘮鎯呭喌-鏈堢粺璁�
+ */
+ @PostMapping("/admin/export/shop/user/doctor/deduction/list/month")
+ Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
index e6207fc..e02dcc3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -34,5 +34,11 @@
@PostMapping(value = "/exp/deduction/surface")
Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
+ /**
+ * 瀵煎嚭鍒掓墸蹇収鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/deduction/surface/data")
+ Result deductionSurfaceData(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
\ No newline at end of file
--
Gitblit v1.8.0