Merge remote-tracking branch 'origin/master'

zhangxu

2022-10-11 07612f2a98dcd9c5c54d2b053987690fec010faa

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

@@ -1,14 +1,11 @@
package com.hz.his.feign.service.platform;

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 com.hz.his.dto.order.*;
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;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -17,31 +14,31 @@
public interface SPhipOrderService {

    /**
     * 开放平台-新-新增订单更新至phis
     * 开放平台-新-新增订单更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/add")
    Result createOrder(@RequestBody OrderCreateDto params);

    /**
     * 开放平台-新-订单状态更新至phis
     * 开放平台-新-订单状态更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/orderUpdate")
    Result updateOrderStatus(@RequestBody OrdersTotalDto params);

    /**
     * 开放平台-新-订单结账更新至phis
     * 开放平台-新-订单结账更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/pay")
    Result payOrderSuc(@RequestBody OrderPayDto params);

    /**
     * 开放平台-新-订单退款更新至phis
     * 开放平台-新-订单退款更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/refund")
    Result refundOrder(@RequestBody OrderRefundDto params);

    /**
     * 开放平台-新-取消订单更新至phis
     * 开放平台-新-取消订单更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/cancel")
    Result cancelOrder(@RequestBody OrderRefundDto params);
@@ -51,4 +48,54 @@
     */
    @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);


}