Merge remote-tracking branch 'origin/master'

fwq

2022-09-23 0a950f6746ac38fcd6813ed7076047e0f27531eb

Merge remote-tracking branch 'origin/master'

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

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

import lombok.Data;

/**
 * @Author   取消订单返回data里面的数据
 */
@Data
public class CancelOrderReturnDto {

    /**退款记录id*/
    private String refundRecordId;
    /**退款记录code*/
    private String refundRecordCode;
}

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

@@ -3,9 +3,7 @@
import com.hx.resultTool.Result;
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;

@@ -71,4 +69,27 @@
    @PostMapping(value = "/order/customer/confirm")
    Result customerConfirm(@RequestBody OrderInfoDto orderInfoDto);

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


}