From 96eecca61dffe5772cab5289a8d813110c25d990 Mon Sep 17 00:00:00 2001 From: zhangxu <3%usVi4iXbVkhI1c> Date: 星期一, 28 十一月 2022 17:13:27 +0800 Subject: [PATCH] 修改取消订单,新增取消订单审批结果 --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) 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 41f25e0..7696ea6 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 @@ -1,6 +1,7 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; +import com.hz.his.dto.aduit.AduitDto; import com.hz.his.dto.order.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -73,23 +74,47 @@ * 寮�鏀惧钩鍙�-鍒ゆ柇璁㈠崟鏄惁鏀寔鍙栨秷宸叉敮浠樼殑璁㈠崟 */ @PostMapping(value = "/order/cancel/verification") - Result cancelVerification(@RequestBody CancelOrderDto CancelOrderDto); + Result cancelVerification(@RequestBody CancelOrderDto cancelOrderDto); /** * 寮�鏀惧钩鍙�-鍙栨秷璁㈠崟锛堟柊锛� * data 瀹炰綋杞寲鐢� CancelOrderReturnDto */ @PostMapping(value = "/order/cancel/v3") - Result cancel(@RequestBody CancelOrderDto CancelOrderDto); + Result cancel(@RequestBody CancelOrderDto cancelOrderDto); /** * 寮�鏀惧钩鍙�-鏍规嵁璁㈠崟id鑾峰彇閫�娆惧崟淇℃伅 */ @PostMapping(value = "/order/refundNote/list") - Result noteList(@RequestBody OrderRefundNoteListDto OrderRefundNoteListDto); + Result noteList(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto); /** * 寮�鏀惧钩鍙�-纭閫�娆惧崟 */ @PostMapping(value = "/order/refundNote/confirm") Result noteConfirm(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto); + /** + * 寮�鏀惧钩鍙�-鏌ヨ璁㈠崟鏀粯闆嗗悎 + */ + @PostMapping(value = "/order/get/ConsumePay") + Result getConsumePay(@RequestBody PayDto dto); + + /** + * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鎶樻墸瀹℃牳閫氳繃/鎷掔粷鎺ュ彛 + */ + @PostMapping(value = "/audit/marketing/aduit") + Result marketingAduit(@RequestBody AduitDto dto); + + /** + * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛 + */ + @PostMapping(value = "/audit/order/cancel") + Result cancelApproval(@RequestBody AduitDto aduitDto); + + /** + * 寮�鏀惧钩鍙�-閮ㄥ垎閫�娆� + * data 瀹炰綋杞寲鐢� CancelOrderReturnDto + */ + @PostMapping(value = "/order/partial/refund") + Result partialRefund(@RequestBody OrderRefundDto orderRefundDto); } \ No newline at end of file -- Gitblit v1.8.0