Merge remote-tracking branch 'origin/master'

fwq

2022-09-23 b5386e29ea8250325d060952dfee0c55138eead8

Merge remote-tracking branch 'origin/master'

 phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java

New file
@@ -0,0 +1,16 @@
package com.hz.his.dto.order;

import lombok.Data;

/**
 * @Author  开放平台取消订单入参
 */
@Data
public class CancelOrderDto {

    /** 订单id */
    private String orderId;

    /** 操作人id */
    private String operatorId;
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java

@@ -5,7 +5,7 @@
import java.util.List;

/**
 * @Author
 * @Author  退款单扩展入参
 */
@Data
public class OrderRefundNoteListDto {

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

@@ -73,23 +73,23 @@
     * 开放平台-判断订单是否支持取消已支付的订单
     */
    @PostMapping(value = "/order/cancel/verification")
    Result cancelVerification(@RequestBody OrderRefundDto orderRefundDto);
    Result cancelVerification(@RequestBody CancelOrderDto cancelOrderDto);
    /**
     * 开放平台-取消订单（新）
     * data 实体转化用 CancelOrderReturnDto
     */
    @PostMapping(value = "/order/cancel/list")
    Result cancel(@RequestBody OrderRefundDto orderRefundDto);
    @PostMapping(value = "/order/cancel/v3")
    Result cancel(@RequestBody CancelOrderDto cancelOrderDto);
     /**
     * 开放平台-根据订单id获取退款单信息
     */
    @PostMapping(value = "/order/refundNote/list")
    Result noteList(@RequestBody OrderRefundDto orderRefundDto);
    Result noteList(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);
    /**
     * 开放平台-确认退款单
     */
    @PostMapping(value = "/order/refundNote/confirm")
    Result noteConfirm(@RequestBody OrderRefundDto orderRefundDto);
    Result noteConfirm(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);


}