From 036b2143b802784ceff0bd0a4ea00a63c9cd8ee8 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 16 八月 2023 14:40:04 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 3 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java | 30 +++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java | 32 ++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 7 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 22 +++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java | 27 +++++++++
6 files changed, 119 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
new file mode 100644
index 0000000..536b8a0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponSendDto{
+
+ /**鎿嶄綔浜虹被鍨�*/
+ private String operatorType;
+ /**鎿嶄綔浜烘爣璇�-蹇呭～*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�-蹇呭～*/
+ private String operatorName;
+
+ /**鎿嶄綔澶囨敞*/
+ private Integer operatorRemark;
+
+ /**鏉ユ簮鏍囪瘑-蹇呭～*/
+ private String commonId;
+ /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
+ private String commonType;
+
+ /**鍙戦�佺殑浼樻儬鍒歌鎯�-蹇呭～*/
+ private List<CouponSendUserDto> sendList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
new file mode 100644
index 0000000..6dfcd7b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponSendItemDto {
+ /**鍙戞斁鎵规-蹇呭～*/
+ private String recordName;
+ /**浼樻儬鍒告爣璇�-蹇呭～*/
+ private String couponId;
+ /**鍙戞斁鏁伴噺-蹇呭～*/
+ private Integer num;
+
+ /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,涓嶅～榛樿涓�涓湀*/
+ private String startTime;
+ /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,涓嶅～榛樿涓�涓湀*/
+ private String endTime;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java
new file mode 100644
index 0000000..3658eb8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendUserDto.java
@@ -0,0 +1,27 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
+ * @author fwq
+ */
+@Data
+public class CouponSendUserDto {
+ /**phis鐢ㄦ埛鏍囪瘑-蹇呭～*/
+ private String userId;
+
+ /**娑堣�楀偍鍊奸噾*/
+ private BigDecimal storedValueFund;
+ /**娑堣�楀鍊奸噾*/
+ private BigDecimal valueAddedFund;
+ /**娑堣�楃Н鍒�*/
+ private BigDecimal integral;
+
+ /**鍙戦�佸埜璇︽儏-蹇呭～*/
+ private List<CouponSendItemDto> couponSendItemDtoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index a5e55e7..393375f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -96,6 +96,9 @@
// 瀵规瘮鐓х墖璁板綍
private String comparePhotoRecordJson;
+ // 鍒掓墸鐓х墖json
+ private String deductionPictureJson;
+
// 鎵归噺娣诲姞椤圭洰id鍒楄〃
private String userProjectIds;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index 9364e5f..53effb1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponDto;
+import com.hz.his.dto.coupon.CouponSendDto;
import com.hz.his.dto.coupon.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,12 @@
Result sendUserCoupon(@RequestBody CouponDto couponDto);
/**
+ * 寮�鏀惧钩鍙�-娲惧彂浼樻儬鍒哥粰鐢ㄦ埛-閲戦鐗堟湰
+ */
+ @PostMapping(value = "/coupon/send/coupon/by/money")
+ Result sendUserCouponByMoney(@RequestBody CouponSendDto couponSendDto);
+
+ /**
* 寮�鏀惧钩鍙�-浣滃簾浼樻儬鍒�
*/
@PostMapping(value = "/coupon/cancel/coupon")
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index 44a831f..88fe124 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -20,18 +20,25 @@
@PostMapping("/admin/doctor/sale/report/deduction/total/list")
Result deductionList(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鍖荤敓-鎵ц涓氱哗鏁版嵁-鍒嗛棬搴�
*/
@PostMapping("/admin/doctor/sale/report/deduction/shop/list")
Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
-
/**
- * 鍖荤敓-鏍稿績椤圭洰
+ * 鍖荤敓-鏍稿績椤圭洰鍗犳瘮鏁版嵁
*/
@PostMapping("/admin/doctor/sale/report/core/project/list")
Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓-鏍稿績椤圭洰涓氱哗杩借釜
+ */
+ @PostMapping("/admin/doctor/sale/report/core/project/list/shop")
+ Result coreProjectShopList(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鎵ц椤圭洰-鍒嗙被
@@ -39,6 +46,13 @@
@PostMapping("/admin/doctor/sale/report/project/type/list")
Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鎵ц椤圭洰-SPU鍗犳瘮
+ */
+ @PostMapping("/admin/doctor/sale/report/project/spu/list")
+ Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
+
/**
* 鎵ц閮ㄤ綅
*/
@@ -46,6 +60,18 @@
Result bodyList(@RequestBody EmployeeReportDto employeeReportDto);
/**
+ * 娴佸け鏁版嵁
+ */
+ @PostMapping("/admin/doctor/sale/report/loss/user/list")
+ Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍖荤敓娌荤枟浼氬憳鎯呭喌
+ */
+ @PostMapping("/admin/doctor/sale/report/treat/user/list")
+ Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
* 鍧愯瘖,鎺ヨ瘖,棰勭害鏁版嵁
*/
@PostMapping("/admin/doctor/sale/report/all/list")
--
Gitblit v1.8.0