Merge branch 'master' into master-test

ANDRU-PC\Andru

2022-12-24 8bc905e2aa0f7ca93bc175858f5aab7166e27491

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/refund/RefundFundsDto.java

New file
@@ -0,0 +1,45 @@
package com.hz.his.dto.refund;

import lombok.Data;

import java.math.BigDecimal;

/**
 * 用户资金退款dto
 */
@Data
public class RefundFundsDto {

    // 退款金额
    private BigDecimal refundTotal;
    // 用户id
    private String userId;
    // 门店id
    private String shopId;
    // 收款方
    private String payee;
    // 开户行
    private String openBank;
    // 开户支行
    private String openBranch;
    // 账号
    private String account;
    // 备注
    private String remarks;
    // 操作人类型
    private Integer operatorType;
    // 操作人id
    private String operatorId;
    // 平台来源
    private String platformSource;

    // 退款标识
    private String refundId;
    // 0:审核失败,1:审核通过
    private Integer type;
    // 审核人标识
    private String examEmplId;

    public RefundFundsDto() {
    }
}

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.refund.RefundFundsDto;
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 = "phip-refund")
public interface SPhipRefundService {

    /**
     * 用户资金退款
     * @param refundFundsDto 参数
     * @return 返回
     */
    @PostMapping("/refund/user/funds")
    Result refundUserFunds(@RequestBody RefundFundsDto refundFundsDto);

    /**
     * 用户资金退款审核
     * @param refundFundsDto 参数
     * @return 返回
     */
    @PostMapping(value = "/refund/user/funds/approve")
    Result refundUserFundsApprove(@RequestBody RefundFundsDto refundFundsDto);
}