From e0d7fa5a50df3fd776be1108c0b72255e94846fb Mon Sep 17 00:00:00 2001 From: zhangxu <3%usVi4iXbVkhI1c> Date: 星期五, 04 十一月 2022 16:51:42 +0800 Subject: [PATCH] 修改取消订单,新增取消订单审批结果 --- phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java | 11 ++++++++++- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 5 +++++ phis-feign/src/main/java/com/hz/his/dto/aduit/AduitDto.java | 2 ++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/aduit/AduitDto.java b/phis-feign/src/main/java/com/hz/his/dto/aduit/AduitDto.java index ed6d84a..1193eb3 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/aduit/AduitDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/aduit/AduitDto.java @@ -21,4 +21,6 @@ private String examEmplName; // 瀹℃牳缁撴灉(0:瀹℃牳澶辫触,1:瀹℃牳閫氳繃),蹇呭~ private Integer type; + //钀ラ攢鍔╂墜瀹℃牳id,蹇呭~ + private String applyId; } diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java index 593fb6b..6b573f0 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java @@ -14,7 +14,16 @@ /** 鎿嶄綔浜篿d 蹇呭~*/ private String operatorId; - /** 骞冲彴鏉ユ簮 蹇呭~*/ + /** 鎿嶄綔浜鸿鑹瞚d 蹇呭~*/ + private String roleId; + + /** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭~*/ + private Integer isApproval; + + /** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭~*/ + private Integer isRefund; + + /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭~*/ private Integer platformSource; /**his鍔╂墜*/ 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 2cc0092..d712705 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 @@ -104,5 +104,10 @@ @PostMapping(value = "/audit/marketing/aduit") Result marketingAduit(@RequestBody AduitDto dto); + /** + * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛 + */ + @PostMapping(value = "/audit/order/cancel") + Result cancelApproval(@RequestBody AduitDto aduitDto); } \ No newline at end of file -- Gitblit v1.8.0