Merge branch 'master' into master-test

wangrenhuang

2023-06-25 b4707c89691166e9febc0e3321c0ecea6d5c30f3

Merge branch 'master' into master-test

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

@@ -68,4 +68,7 @@
    @PostMapping(value = "/emp/role/info/list")
    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);

    @PostMapping(value = "/emp/check/doctor")
    Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);

}

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

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

import com.hx.resultTool.Result;
import com.hz.his.vo.order.refund.card.RefundUserCardVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**用户卡项退款feign
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 * @author CJH
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "card-refund")
public interface SCardRefundService {

    /**
     * 开放平台-获取用户卡项条目可退款金额
     * data 实体转化用（RefundUserCardVo）
     */
    @PostMapping(value = "/card/refund/get/amount")
    Result getRefundAmount(@RequestBody RefundUserCardVo refundUserCardVo);

    /**
     * 开放平台-确认提交退款
     * data 无实体转化用
     */
    @PostMapping(value = "/confirm")
    Result refundConfirm(@RequestBody RefundUserCardVo refundUserCardVo);

}