Merge remote-tracking branch 'origin/master'

童刚

2022-08-03 02e460a52667915cda6c4ebb58488646795c37ec

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java

@@ -1,9 +1,10 @@
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.resultTool.Result;
import com.hz.his.dto.order.OrderCreateDto;
import com.hz.his.dto.order.OrderPayDto;
import com.hz.his.dto.order.OrderRefundDto;
import com.hz.his.dto.order.OrdersTotalDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -24,7 +25,7 @@
     * 开放平台-新-订单状态更新至phis
     */
    @PostMapping(value = "/newSync/order/orderUpdate")
    Result updateOrderStatus(@RequestBody OrdersTotal params);
    Result updateOrderStatus(@RequestBody OrdersTotalDto params);

    /**
     * 开放平台-新-订单结账更新至phis
@@ -36,12 +37,12 @@
     * 开放平台-新-订单退款更新至phis
     */
    @PostMapping(value = "/newSync/order/refund")
    Result refundOrder(String params);
    Result refundOrder(@RequestBody OrderRefundDto params);

    /**
     * 开放平台-新-取消订单更新至phis
     */
    @PostMapping(value = "/newSync/order/cancel")
    Result cancelOrder(String params);
    Result cancelOrder(@RequestBody OrderRefundDto params);

}