From 08fa864c5a8510f3981109154aecba7eab445094 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 14 四月 2023 18:01:40 +0800
Subject: [PATCH] 咨询师现金
---
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java | 82 +++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java | 53 +++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java | 3
3 files changed, 136 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java
new file mode 100644
index 0000000..bdf041e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashDto.java
@@ -0,0 +1,82 @@
+package com.hz.his.dto.report;
+
+
+import lombok.Data;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ConsultantCashDto{
+
+ private String userId;
+
+ private String userName;
+
+ private String tel;
+
+ private String CIQ;
+
+ private String memberNO;
+
+ private String userType;
+
+ private String channelId;
+
+ private String channelName;
+
+ private String channel2Id;
+
+ private String channelName2;
+
+ private String channelCategory;
+
+ private String arrivalType;
+
+ private String orderNo;
+ private String type;
+ private String orderId;
+ private String developerShopId;
+ private String developerShopName;
+ private String cashierShopId;
+ private String cashierShopName;
+ private String serviceShopId;
+ private String serviceShopName;
+ private String operatorId;
+ private String operatorName;
+ private Date orderTime;
+ private String orderConsultantId;
+ private String orderConsultantName;
+ private String cashierId;
+ private String cashierName;
+ private String developerId;
+ private String developerName;
+ private String goodsType;
+ private String itemTypeId1;
+ private String itemTypeName1;
+ private String itemTypeId2;
+ private String itemTypeName2;
+ private String itemTypeId3;
+ private String itemTypeName3;
+ private String goodsName;
+ private BigDecimal discount;
+ private String doctorQualification;
+ private String specification;
+ private String unit;
+ private String specs = "[]";
+ private BigDecimal proPrice=BigDecimal.ZERO;
+ private Integer buyNum;
+ private String transactionType;
+ private String payMode;
+ private Date payTime;
+ private String remarks;
+
+ private BigDecimal performanceMoney=BigDecimal.ZERO;
+
+ //鐢ㄦ埛鍜ㄨ甯堬紙鑽ｇ埛璇存潈闄愭寜鐓ц繖涓煡璇級
+ private String hisCorpUserName;
+
+ //浜ゆ槗绫诲瀷
+ public static final String TYPE_TRANSACTION_PROCEEDS="鏀舵";
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
new file mode 100644
index 0000000..30db6c9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java
@@ -0,0 +1,53 @@
+package com.hz.his.dto.report;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鍜ㄨ甯堢幇閲戜笟缁╂姤琛�
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/12/22/10:35
+ * @Description:
+ */
+@Data
+public class ConsultantCashReportDto extends PageDto {
+ //寮�鍗曟椂闂达細寮�濮嬫椂闂�(鏍煎紡:yyyy-MM-dd)
+ private String startTime;
+ //寮�鍗曟椂闂达細缁撴潫鏃堕棿(鏍煎紡:yyyy-MM-dd)
+ private String endTime;
+ //闂ㄥ簵鏍囪瘑
+ private String shopId;
+ //鏀堕摱闂ㄥ簵
+ private String cashierShopId;
+ //鍏抽敭瀛楁煡璇�
+ private String keyWord;
+ //涓氬姟鍒嗙被('鏀舵','閫�娆�')
+ private String transactionType;
+ //钀ラ攢鍒嗙被(鍟嗗搧鍒嗙被,OrderItemConstants)
+ private String goodsType;
+ //璁㈠崟绫诲瀷(OrderTotalConstants)
+ private String type;
+ //璁㈠崟鍙�
+ private String orderNo;
+ //娓犻亾锛屾湯绾d
+ private String channel2Id;
+ //瀹㈡埛(濮撳悕銆乧iq銆佷細鍛樺彿銆佹墜鏈哄彿)
+ private String userName;
+ //瀹㈡埛绫诲埆
+ private String userType;
+ //椤圭洰鍒嗙被,鏈骇id
+ private String itemTypeId;
+ //鍟嗗搧鍚嶇О
+ private String goodsName;
+ //寮�鍗曞挩璇㈠笀锛堣崳鐖疯鏉冮檺鎸夌収杩欎釜鏌ヨ锛�
+ private String orderConsultantId;
+ //寮�鍗曞挩璇㈠笀锛堣崳鐖疯鏉冮檺鎸夌収杩欎釜鏌ヨ锛�
+ private String orderConsultantName;
+ //寮�鍗曞挩璇㈠笀锛堣崳鐖疯鏉冮檺鎸夌収杩欎釜鏌ヨ锛�
+ private ConsultantCashDto consultantCashReport;
+ //鐢ㄦ埛鍜ㄨ甯堬紙鑽ｇ埛璇存潈闄愭寜鐓ц繖涓煡璇級
+ private String hisCorpUserName;
+ //鐢ㄦ埛鍜ㄨ甯堬紙鑽ｇ埛璇存潈闄愭寜鐓ц繖涓煡璇級
+ private String hisCorpUserId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
index 01e26f5..a82dc30 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -5,7 +5,6 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
/**
@@ -47,7 +46,7 @@
* 鍏跺畠涓氱哗淇℃伅
* ShopOtherVo
*/
- @RequestMapping("/admin/export/shop/other/list")
+ @PostMapping("/admin/export/shop/other/list")
Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
}
--
Gitblit v1.8.0