Merge branch 'master' into master-test

zhangxu

2022-11-28 5e449fc5834aff0e4100a9defd93b5cb3c82b4cb

Merge branch 'master' into master-test

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

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

/**
 * @Author
 */
public class OrderCouponRefunDto {

    /** 订单使用优惠卷id */
    private String orderCouponId;
    /** 优惠标题 */
    private String orderCouponTitle;
}

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

@@ -30,4 +30,24 @@
    //非必填 重发标识
    private String resendRecordId;


    /** 退款信息集合 必填 */
    private List<OrderCouponRefunDto> couponList;
    /** 操作人角色id 必填*/
    private String roleId;
    /** 是否需要审批  (0否 1是)   必填*/
    private Integer isApproval;

    /** 是否自动生成退款单  (0否 1是)   必填*/
    private Integer isRefund;

    /** 平台来源  因为是his助手取消订单的话就要自动确认退款单  必填*/
    private Integer platformSource;

    /**his助手*/
    public static  Integer HIS_ASSISTANT = 0;

    /**his后台*/
    public static  Integer HIS_BACKSTAGE = 1;

}

 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.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 是请求接口前缀
@@ -124,4 +124,11 @@
    Result orderPayMoney(@RequestBody PayDto dto);


    /**
     * 开放平台-部分退款
     * data 实体转化用 CancelOrderReturnDto
     */
    @PostMapping(value = "/order/partial/refund")
    Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);

}