Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

chenjiahe

2022-09-22 9f20421d877be1d13460ff607b66a71810d6f154

Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

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

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

import lombok.Data;

import java.math.BigDecimal;

/**
 * @Author
 */

@Data
public class OrderRefundNoteDto {

    private String id;
    //退款路径"
    private Integer refundroute;
    //退款方式编号
    private String refundNumberNo;
    //退款方式名称
    private String refundName;
    //只有在转储值金的时候才有这玩意
    //退款储值金金额
    private BigDecimal refundStoredTotal;
    //退款状态
    private Integer refundStatus;
    //备注
    private String remarks;

}

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

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

import lombok.Data;

import java.util.List;

/**
 * @Author
 */
@Data
public class OrderRefundNoteListDto {

    /** 退款的方式集合 */
    private List<OrderRefundNoteDto> orderRefundNoteDtos;

    //操作人员id
    private String operationId;

    /** 订单id */
    private String orderId;

}

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

@@ -27,4 +27,12 @@
     */
    @GetMapping(value = "/sync/project/update/service/tree")
    Result updateServiceTree(@RequestBody JSONObject jsonObject);

    /**
     * 同步his用户可划扣的数据
     * @param jsonObject 参数
     * @return 返回
     */
    @GetMapping(value = "/sync/executionRecord/executable")
    Result syncExecutionRecord(@RequestBody JSONObject jsonObject);
}