From fc9cac864414b566e3516f6702b716e8ed00e9dc Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 六月 2023 16:34:29 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java | 11 +
phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java | 40 ++++
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java | 33 +++
phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java | 60 ++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 9 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 6
phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java | 4
phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java | 4
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 13
phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java | 30 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java | 12 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java | 11 +
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java | 31 +++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 14 +
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java | 75 ++++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java | 7
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java | 23 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java | 15 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 6
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java | 14 +
phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java | 66 +++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 2
24 files changed, 479 insertions(+), 11 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
new file mode 100644
index 0000000..a682a4a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java
@@ -0,0 +1,75 @@
+package com.hz.his.dto.employee;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Table;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Unique;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 鍛樺伐
+ * author:fhx
+ * Date:2021/8/4 17:35
+ */
+
+@Data
+public class EmployeeVo {
+
+ private String id;
+ private String unionId;
+
+ private String userId;
+
+ private String cnName;
+
+ private String enName;
+
+ private String tel;
+
+ private String email;
+
+ private String imgUrl;
+
+ private String apiId;
+
+ private Integer isJob;
+
+ private Integer gender ;
+
+ private String employeeNo;
+
+ private String roleId;
+
+ private Integer isSyncRole;
+ private String idCard;
+ private String birthday;
+ private String degree;
+ private String certificateNo;
+ private String password;
+ private Integer isPerformanceEmp;
+ private String cardId;
+
+ //sql璇彞杩斿洖浣跨敤瀛楁
+ private String shopId;
+ private String shopName;
+ private String shopHisId;
+ private String roleName;
+ private String roleStr;
+ private String roleTypeId;
+ private String adminRoleId;
+ //鐧诲綍瑙掕壊id
+ private String loginRoleId;
+
+ // 鍏宠仈鍚庡彴绠＄悊鍛榠d
+ private String adminId;
+ private String adminName;
+
+ public EmployeeVo() {
+ }
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java
new file mode 100644
index 0000000..49fc2f1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.marketing;
+
+import com.hz.his.dto.order.OrdersTotalDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜璁㈠崟鏀粯鐢宠鍏ュ弬
+ * @author fwq
+ */
+@Data
+public class OrderPayMarketingDto extends MarketingDto{
+ /*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
+ /**璁㈠崟淇℃伅*/
+ private OrdersTotalDto ordersTotalDto;
+ /**璁㈠崟鎶樻墸(鍗曚綅:鐧惧垎姣�)*/
+ private BigDecimal discountNum;
+ /**璁㈠崟椤圭洰淇℃伅*/
+ private List<RefundProjectDto> projectDtoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
index 41682b1..d82b1c7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
@@ -17,4 +17,6 @@
private String projectName;
/**閫�鐨勬暟閲� 鍟嗗搧/椤圭洰/... - 蹇呭～*/
private Integer refundNum;
+ /**涔扮殑鏁伴噺 鍟嗗搧/椤圭洰/...*/
+ private Integer buyNum;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 1e89f21..e05dee0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -40,6 +40,8 @@
//////绯荤粺鍙傛暟
/** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal totalAmount;
+ /** 鍙��娆炬�荤Н鍒嗭紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalIntegral;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundTotal;
/** 鍙��娆炬柟寮忛泦鍚� */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
index 12f1a2c..e324612 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CashierSettlementDto.java
@@ -32,6 +32,8 @@
private String shopId;
/**瀹㈡埛鎵�灞為棬搴�*/
private String userShopId;
+ /**閿�鍞钩鍙�*/
+ private String sourceName;
/*******淇濆瓨鍙傛暟********/
/**鎿嶄綔浜烘爣璇�*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
index c0cd102..8a9270a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/PerformanceReqParamsDto.java
@@ -87,4 +87,8 @@
private Integer sumIsShop = NO;
//姹囨�昏鑹�
private String sumRole;
+
+ //鎿嶄綔浜�
+ private String operatorId;
+ private String operatorName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
index 7cdcddd..6416aed 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
@@ -22,4 +22,8 @@
private String chatCorpUserId;
//鍓嶇疆澶╂暟
private Integer leadDays;
+
+ //鎿嶄綔浜�
+ private String operatorId;
+ private String operatorName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java
new file mode 100644
index 0000000..167c2c0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/shop/ShopVo.java
@@ -0,0 +1,60 @@
+package com.hz.his.dto.shop;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * 闂ㄥ簵
+ */
+@Data
+public class ShopVo {
+
+ private String id;
+ private String code;
+
+ private String name;
+
+ private String institutionalCode;
+
+ private String departmentId;
+
+ private Integer corpMpDepId;
+
+ private Integer maxAppNum;
+
+ private Integer maxSwitchNum;
+
+ private Integer isUp;
+
+ private String workTime;
+
+ private String province;
+
+ private String city;
+
+ private String area;
+
+ private String addr;
+
+ private String colorStr;
+
+ private String doctorRelaxTime;
+
+ private String carWay;
+
+ private String subWay;
+
+ private String apiId;
+ private Integer shengMeiNum;
+ private Integer sameTimeCustomerNum;
+
+ private String clinicCode;
+ private String clinicName;
+
+ private Integer isPerformanceShop;
+
+ public ShopVo() {
+ }
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 4dd2935..3768939 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,7 +1,11 @@
package com.hz.his.dto.user;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
+
+import java.util.Date;
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@@ -35,4 +39,9 @@
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
private Integer isHaveCorp;
+
+ private Date startTime;
+
+ private Date endTime;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
index 523328a..02c2ae7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
@@ -4,6 +4,7 @@
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
import com.hz.his.dto.marketing.OrderPartRefundDto;
+import com.hz.his.dto.marketing.OrderPayMarketingDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,4 +35,10 @@
@PostMapping(value = "/order/apply/part/refund")
Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
+ /**
+ * 璁㈠崟鏀粯鐢宠
+ */
+ @PostMapping(value = "/order/apply/order/pay")
+ Result orderPay(@RequestBody OrderPayMarketingDto orderPayMarketingDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 270b09c..4e4d24a 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -68,4 +68,10 @@
@PostMapping(value = "/emp/role/info/list")
Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);
+ @PostMapping(value = "/emp/check/doctor")
+ Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);
+
+ @PostMapping(value = "/emp/detail/name")
+ Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
index 4321960..d83a8de 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SShopService.java
@@ -36,4 +36,19 @@
*/
@PostMapping(value = "/shop/list")
Result getList(@RequestBody TimeDto timeDto);
+
+
+ /**
+ * 鑾峰彇闂ㄥ簵璇︽儏杩斿洖vo
+ * @return Result
+ */
+ @PostMapping(value = "/shop/detail/vo")
+ Result getShopDetailVo(@RequestBody ShopDto shopDto);
+
+ /**
+ * 鑾峰彇闂ㄥ簵璇︽儏杩斿洖vo
+ * @return Result
+ */
+ @PostMapping(value = "/shop/detail/name")
+ Result getDetailByName(@RequestBody ShopDto shopDto);
}
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 1a14dcb..cb058e1 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
@@ -285,8 +285,20 @@
Result nextLevel(@RequestBody UserDto userDto);
/**
- * 鏌ヨ鐢ㄦ埛浼氬憳绛夌骇涓嬩竴绾�
+ * 鏌ヨ绱杩斾剑
* */
@PostMapping(value = "/user/query/rebate")
Result queryRebate(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/first/day/consumption")
+ Result firstDayConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/accumulat/consumption")
+ Result accumulateConsumption(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index dde47ce..970d425 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -106,6 +106,12 @@
Result marketingAduit(@RequestBody AduitDto dto);
/**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鏀粯瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/marketing/aduit/pay")
+ Result marketingAduitPay(@RequestBody AduitDto dto);
+
+ /**
* 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
*/
@PostMapping(value = "/audit/order/cancel")
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
index 8e14d7d..7e9d2f3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantPerfService.java
@@ -27,6 +27,17 @@
Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鍜ㄨ甯堜笟缁╁鍑�
+ */
+ @PostMapping("/admin/consultant/perf/export")
+ Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+ /**
+ * 鍜ㄨ甯堜笟缁╂眹鎬诲鍑�
+ */
+ @PostMapping("/admin/consultant/perf/summary/export")
+ Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
index 90a2683..1968ec7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorPerfService.java
@@ -27,6 +27,17 @@
Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鍖荤敓涓氱哗瀵煎嚭
+ */
+ @PostMapping("/admin/doctor/perf/export")
+ Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+ /**
+ * 鍖荤敓涓氱哗姹囨�诲鍑�
+ */
+ @PostMapping("/admin/doctor/perf/summary/export")
+ Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
index c124cfc..2a5380c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiNursePerfService.java
@@ -21,12 +21,22 @@
Result list(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
/**
- * 鍖荤敓鎵ц涓氱哗姹囨��
+ * 鎶ゅ＋鎵ц涓氱哗姹囨��
*/
@PostMapping("/admin/nurse/perf/summary/list")
Result summaryList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鎶ゅ＋涓氱哗瀵煎嚭
+ */
+ @PostMapping("/admin/nurse/perf/export")
+ Result export(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+ /**
+ * 鎶ゅ＋涓氱哗姹囨�诲鍑�
+ */
+ @PostMapping("/admin/nurse/perf/summary/export")
+ Result sumExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
index 4b2f735..da3e69f 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
@@ -16,7 +16,7 @@
public interface BiTmkPerfService {
/**
- * 璁㈠崟涓氱哗鏄庣粏鍒楄〃
+ * 鐢电綉涓氱哗鏄庣粏鍒楄〃
*/
@PostMapping("/admin/tmk/perf/orderPerfList")
Result orderPerfList(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
@@ -33,5 +33,17 @@
@PostMapping("/admin/tmk/perf/summary/sumData")
Result sumData(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+ /**
+ * 鐢电綉涓氱哗瀵煎嚭
+ */
+ @PostMapping("/admin/tmk/perf/orderPerfExport")
+ Result export(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+
+ /**
+ * 鐢电綉涓氱哗姹囨�诲鍑�
+ */
+ @PostMapping("/admin/tmk/perf/summary/export")
+ Result sumExport(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto);
+
}
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 e159665..e6207fc 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
@@ -1,11 +1,8 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
-import com.hz.his.dto.file.FileExUpdateDto;
-import com.hz.his.dto.file.FileExportDto;
-import com.hz.his.vo.bi.exp.CashierSettlementVo;
-import com.hz.his.vo.bi.exp.CashierSurfaceVo;
-import com.hz.his.vo.bi.exp.DeductionSurfaceVo;
+import com.hz.his.dto.report.CashierSettlementDto;
+import com.hz.his.dto.report.DeductionSurfaceDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,21 +18,21 @@
* 鏃犺浆鎹�
*/
@PostMapping(value = "/exp/cashier/settlement")
- Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
+ Result cashierSettlement(@RequestBody CashierSettlementDto cashierSettlementDto);
/**
* 瀵煎嚭鏀堕摱鎶ヨ〃
* 杞崲鏃�
*/
@PostMapping(value = "/exp/cashier/surface")
- Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);
+ Result cashierSurface(@RequestBody CashierSettlementDto cashierSettlementDto);
/**
* 瀵煎嚭鍒掓墸鎶ヨ〃
* 杞崲鏃�
*/
@PostMapping(value = "/exp/deduction/surface")
- Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);
+ Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
new file mode 100644
index 0000000..4761502
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/refund/SCardRefundService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.refund;
+
+import com.hx.resultTool.Result;
+import com.hz.his.vo.order.refund.card.RefundUserCardVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**鐢ㄦ埛鍗￠」閫�娆緁eign
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ * @author CJH
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "card-refund")
+public interface SCardRefundService {
+
+ /**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍗￠」鏉＄洰鍙��娆鹃噾棰�
+ * data 瀹炰綋杞寲鐢紙RefundUserCardVo锛�
+ */
+ @PostMapping(value = "/card/refund/get/amount")
+ Result getRefundAmount(@RequestBody RefundUserCardVo refundUserCardVo);
+
+ /**
+ * 寮�鏀惧钩鍙�-纭鎻愪氦閫�娆�
+ * data 鏃犲疄浣撹浆鍖栫敤
+ */
+ @PostMapping(value = "/confirm")
+ Result refundConfirm(@RequestBody RefundUserCardVo refundUserCardVo);
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
new file mode 100644
index 0000000..053da40
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
@@ -0,0 +1,40 @@
+package com.hz.his.vo.order.refund;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author CJH
+ * 閫�鍥炴敮浠樿褰曟墿灞�
+ */
+@Data
+public class RefundMethodVo {
+
+ /** 鍙��鏀粯鏂瑰紡鏍囪瘑 */
+ private String payMethodId;
+ /** 鍙��鏀粯鏂瑰紡缂栫爜 */
+ private String payMethodNo;
+ /** 鍙��鏀粯鏂瑰紡鍚嶇О */
+ private String payMethodName;
+ /** 鍙��鏀粯閲戦 */
+ private BigDecimal payTotal;
+ /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPay;
+ /**鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecute;
+
+ /** 杞崲鏂瑰紡鏍囪瘑 锛堝疄闄呴��娆炬柟寮忔爣璇嗭級*/
+ private String refundMethodId;
+ /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundMethodNo;
+ /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/
+ private String refundMethodName;
+ /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/
+ private BigDecimal refundTotal;
+ /**杞崲鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/
+ private Integer isMoneyPayRefund;
+ /**杞崲鏄惁鍒掓墸璁＄畻锛�0鍚�1鏄�*/
+ private Integer isExecuteRefund;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
new file mode 100644
index 0000000..bcdaa7e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
@@ -0,0 +1,31 @@
+package com.hz.his.vo.order.refund.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉冪泭
+ * @author CJH
+ * */
+@Data
+public class RefundUserCardEquityVo {
+
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鏍囪瘑 */
+ private String cardEquityId;
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鍚嶇О */
+ private String cardEquityName;
+ /** 閫�娆惧崱椤规潯鐩� */
+ private List<RefundUserCardItemVo> refundUserCardItemVoList;
+
+ //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
new file mode 100644
index 0000000..c079fca
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
@@ -0,0 +1,33 @@
+package com.hz.his.vo.order.refund.card;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鏉＄洰
+ * @author CJH
+ * */
+@Data
+public class RefundUserCardItemVo {
+
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鏍囪瘑 */
+ private String cardItemInfoId;
+ /** 鐢ㄦ埛鍗″寘鍗￠」鏉＄洰鍚嶇О */
+ private String cardItemInfoName;
+ /**閫�娆炬暟閲忥紙鎶垫墸娆℃暟锛�*/
+ private Integer refundQuantity;
+ /**鏄惁鏈�鍚庣殑鎶垫墸娆℃暟*/
+ private boolean lastNum = false;
+
+ //---鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /** 鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /** 鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
new file mode 100644
index 0000000..5a96e24
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
@@ -0,0 +1,66 @@
+package com.hz.his.vo.order.refund.card;
+
+
+import com.hz.his.vo.order.refund.RefundMethodVo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**鍗￠」锛堝崱鍖咃級閫�娆鹃噾棰濅俊鎭绠楃粨鏋勪綋-鎬讳俊鎭�
+ * @author CJH
+ */
+@Data
+public class RefundUserCardVo {
+
+ /** 鐢ㄦ埛鍗″寘鏍囪瘑 */
+ private String userCardId;
+ /** 鐢ㄦ埛鍗″寘鍚嶇О */
+ private String userCardName;
+
+ /** 鍗￠」鏉冪泭 */
+ private List<RefundUserCardEquityVo> refundUserCardEquityVoList;
+ /**鏀粯鏂瑰紡*/
+ private List<RefundMethodVo> payMethodVos;
+ /**閫�娆炬敮浠樻柟寮�*/
+ private List<RefundMethodVo> refundMethodVos;
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+ private String refundReason;
+
+ /**鎿嶄綔浜虹被鍨嬶紝榛樿鍛樺伐*/
+ private String opType = OP_TYPE_STAFF;
+ /**鎿嶄綔鍛樺伐鏍囪瘑*/
+ private String staffId;
+ /**鎿嶄綔鍛樺伐瑙掕壊鏍囪瘑*/
+ private String staffRoleId;
+ /**鎿嶄綔骞冲彴-鏍囧織*/
+ private String appId;
+ /**鎿嶄綔骞冲彴-鍟嗘埛鑷畾涔夌紪鐮�*/
+ private String appIdCode;
+ /**鎿嶄綔骞冲彴-鍚嶇О*/
+ private String appIdName;
+
+ //-----鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁＄畻
+ /**绯荤粺璁＄畻璧嬪��-鍙��鎬婚噾棰�*/
+ private BigDecimal approveRefundTotal = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍙��鎬荤Н鍒�*/
+ private BigDecimal approveRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤閲戦*/
+ private BigDecimal occupyRefundTotal = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-鍒嗛厤绉垎*/
+ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆鹃噾棰�*/
+ private BigDecimal refundTotal = BigDecimal.ZERO;
+ /**绯荤粺璁＄畻璧嬪��-閫�娆剧Н鍒�*/
+ private BigDecimal refundIntegral = BigDecimal.ZERO;
+
+ /**鎿嶄綔绫诲瀷-绯荤粺*/
+ public static final String OP_TYPE_SYSTEM = "system";
+ /**鎿嶄綔绫诲瀷-鐢ㄦ埛*/
+ public static final String OP_TYPE_USER = "user";
+ /**鎿嶄綔绫诲瀷-鍛樺伐*/
+ public static final String OP_TYPE_STAFF = "staff";
+
+}
--
Gitblit v1.8.0