Merge remote-tracking branch 'origin/master' into master-test

fwq

2022-12-30 174051f74a5842466c68c0601832fbb5a952608e

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

@@ -4,9 +4,9 @@
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.*;

import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -110,4 +110,51 @@
    @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);
}