Merge branch 'master-prod-new' into master-test

chenjiahe

2023-08-07 6b6c463295ae518720c5fe084d1b81162e8c8792

Merge branch 'master-prod-new' into master-test

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

New file
@@ -0,0 +1,24 @@
package com.hz.his.feign.service.platform.payment;

import com.hx.resultTool.Result;
import com.hz.his.vo.order.refund.qr.RefundQrVo;
import com.hz.his.vo.payment.PayNoVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "c-notify-r")
public interface SConsumeNotifyRefundService {

    /**
     * 订单二维码调起退款
     * 针对未支付的订单，但是已经使用了订单二维码支付
     * data使用 RefundQrResponseVo 转化
     */
    @PostMapping(value = "/order/qr/refund")
    Result orderQrRefund(@RequestBody RefundQrVo refundQrVo);

}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrResponseVo.java

New file
@@ -0,0 +1,18 @@
package com.hz.his.vo.order.refund.qr;

import lombok.Data;

import java.math.BigDecimal;

/**订单二维码退款返回实体
 * @author CJH
 */
@Data
public class RefundQrResponseVo {
    /**Y-退款编号*/
    private String refudnNo;
    /**Y-订单标识*/
    private  String orderId;
    /**Y-退款金額，必须和支付金额一样*/
    private BigDecimal refundTotal;
}

 phis-feign/src/main/java/com/hz/his/vo/order/refund/qr/RefundQrVo.java

@@ -17,4 +17,6 @@
    private BigDecimal refundTotal;
    /**Y-操作员工*/
    private String employeeId;
    /**N-退款备注*/
    private String remark;
}