From 8bb9c77d61c0d20e8a06e9185bf0a89a16dd6be2 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 16 四月 2024 11:30:24 +0800
Subject: [PATCH] 1.修改

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java |  162 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 152 insertions(+), 10 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 e3819b6..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
@@ -1,13 +1,13 @@
 package com.hz.his.feign.service.platform;
 
-import com.hx.phiappt.model.order.OrdersTotal;
-import com.hx.phip.dto.order.OrderCreateDto;
-import com.hx.phip.dto.order.OrderPayDto;
-import com.hx.phip.dto.order.OrderRefundDto;
 import com.hx.resultTool.Result;
+import com.hz.his.dto.aduit.AduitDto;
+import com.hz.his.dto.order.*;
+import com.hz.his.vo.order.refund.RefundCancelVo;
 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.RequestHeader;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
@@ -16,33 +16,175 @@
 public interface SPhipOrderService {
 
     /**
-     * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his
+     * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his (搴熷純)
      */
     @PostMapping(value = "/newSync/order/add")
     Result createOrder(@RequestBody OrderCreateDto params);
 
     /**
-     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis
+     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis (搴熷純)
      */
     @PostMapping(value = "/newSync/order/orderUpdate")
-    Result updateOrderStatus(@RequestBody OrdersTotal params);
+    Result updateOrderStatus(@RequestBody OrdersTotalDto params);
 
     /**
-     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his
+     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his (搴熷純)
      */
     @PostMapping(value = "/newSync/order/pay")
     Result payOrderSuc(@RequestBody OrderPayDto params);
 
     /**
-     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis
+     * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis (搴熷純)
      */
     @PostMapping(value = "/newSync/order/refund")
     Result refundOrder(@RequestBody OrderRefundDto params);
 
     /**
-     * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his
+     * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his (搴熷純)
      */
     @PostMapping(value = "/newSync/order/cancel")
     Result cancelOrder(@RequestBody OrderRefundDto params);
 
+    /**
+     * 寮�鏀惧钩鍙�-鍚屾涓績蹇冭烦閫�娆炬祦绋�
+     */
+    @PostMapping(value = "/refund/syn/refund")
+    Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-寮�鍗�
+     * 瀹炰綋杞寲鐢� CreateOrderReturnDto
+     */
+    @PostMapping(value = "/order/add")
+    Result orderAdd(@RequestBody OrderPHisDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-缁撹处
+     */
+    @PostMapping(value = "/order/pay")
+    Result orderPay(@RequestBody PayDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛纭璁㈠崟
+     */
+    @PostMapping(value = "/order/customer/confirm")
+    Result customerConfirm(@RequestBody OrderInfoDto orderInfoDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍒ゆ柇璁㈠崟鏄惁鏀寔鍙栨秷宸叉敮浠樼殑璁㈠崟
+     */
+    @PostMapping(value = "/order/cancel/verification")
+    Result cancelVerification(@RequestBody CancelOrderDto cancelOrderDto);
+    /**
+     * 寮�鏀惧钩鍙�-鍙栨秷璁㈠崟锛堟柊锛�
+     * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+     */
+    @PostMapping(value = "/order/cancel/v3")
+    Result cancel(@RequestBody CancelOrderDto cancelOrderDto);
+     /**
+     * 寮�鏀惧钩鍙�-鏍规嵁璁㈠崟id鑾峰彇閫�娆惧崟淇℃伅
+     */
+    @PostMapping(value = "/order/refundNote/list")
+    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/marketing/aduit/pay")
+    Result marketingAduitPay(@RequestBody AduitDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+     */
+    @PostMapping(value = "/audit/order/cancel")
+    Result cancelApproval(@RequestBody AduitDto aduitDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-寮�鍗�
+     * 瀹炰綋杞寲鐢� CreateOrderReturnDto
+     */
+    @PostMapping(value = "/order/create")
+    Result orderCreate(@RequestBody OrderPHisDto dto);
+
+    /**
+     * 寮�鏀惧钩鍙�-缁撹处
+     */
+    @PostMapping(value = "/order/payMoney")
+    Result orderPayMoney(@RequestBody PayDto dto);
+
+
+    /**
+     * 寮�鏀惧钩鍙�-閮ㄥ垎閫�娆�
+     * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+     */
+    @PostMapping(value = "/order/partial/refund")
+    Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);
+
+    /**
+     * 閮ㄥ垎閫�娆炬樉绀烘暟鎹帴鍙�
+     * data 瀹炰綋杞寲鐢� OrderDto
+     */
+    @PostMapping(value = "/order/refund/details")
+    Result refundDetails(OrderRefundDto orderRefundDto);
+
+    /**
+     * 閫夊畬鏁伴噺鐐瑰嚮涓嬩竴姝ユ樉绀烘暟鎹帴鍙�
+     * data 瀹炰綋杞寲鐢� OrderOrderRefundDtoDto
+     */
+    @PostMapping(value = "/order/refund/nextStep")
+    Result nextStep(OrderRefundDto orderRefundDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟閮ㄥ垎閫�娆惧鏍搁�氳繃/鎷掔粷鎺ュ彛
+     */
+    @PostMapping(value = "/audit/order/partRefund")
+    Result partRefundApproval(@RequestBody AduitDto aduitDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鍏ㄩ儴閫�娆�
+     * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+     */
+    @PostMapping(value = "/order/whole/refund")
+    Result wholeRefund(@RequestBody OrderRefundDto orderRefundDto);
+
+    /**
+     * 閲嶆柊鍒濆鍖栬鍗曢噾棰�
+     * 鏍规嵁鏀粯璁板綍鍘婚噸鏂扮畻鍚勭閲戦
+     */
+    @PostMapping(value = "/order/init/order-money")
+    Result initOrderMoney(@RequestBody OrderInitVo orderInitVo);
+
+    /**
+     * 寮�鏀惧钩鍙�-浣滃簾閫�娆�
+     * data 瀹炰綋杞寲鐢� 鏃�
+     */
+    @PostMapping(value = "/order/refund/cancel")
+    Result refundCancel(@RequestBody RefundCancelVo refundCancelVo);
+
+
+    /**
+     * 璁$畻璁㈠崟搴斾粯閲戦
+     */
+    @PostMapping(value = "/order/countOrderShouldTotal")
+    Result countOrderShouldTotal(@RequestBody OrderCountShouldTotalDto dto);
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0