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

fwq

2023-02-03 7e4852e4b12f5728e11e9c50caa96d3aba3786ff

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

@@ -1,13 +1,12 @@
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;

import javax.servlet.http.HttpServletRequest;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -54,6 +53,7 @@

    /**
     * 开放平台-开单
     * 实体转化用 CreateOrderReturnDto
     */
    @PostMapping(value = "/order/add")
    Result orderAdd(@RequestBody OrderPHisDto dto);
@@ -63,4 +63,98 @@
     */
    @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/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);
}