Merge branch 'master-zhangxu' into master-test

zhangxu

2022-12-13 0bfe0ee18e302123944a2a33ba5760a8a3da25f7

Merge branch 'master-zhangxu' into master-test

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

@@ -2,6 +2,7 @@

import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -30,7 +31,8 @@
    //非必填 重发标识
    private String resendRecordId;


    /** 退款金额 */
    private BigDecimal totalAmount;
    /** 退款信息集合 必填 */
    private List<OrderCouponRefunDto> couponList;
    /** 操作人角色id 必填*/

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

@@ -25,7 +25,7 @@
    @GetMapping(value = "/sync/order/getOrderById")
    Result getOrderById(@RequestParam("orderId") String orderId);

   /**
    /**
     * 修改领健订单为作废订单
     * 注意不要随意调用，需要用到先和同步中心商量
     * @param syncOrderDto
@@ -42,5 +42,14 @@
     */
    @PostMapping(value = "/sync/order/refundOrder")
    Result refundOrder(SyncOrderDto syncOrderDto);
    /**
     * 修改领建订单为部分退款状态
     * 注意不要随意调用，需要用到先和同步中心商量
     * @param syncOrderDto
     * @return
     */
    @PostMapping(value = "/sync/order/partialRefund")
    Result partialRefund(SyncOrderDto syncOrderDto);


}