Merge remote-tracking branch 'origin/master'

fwq

2022-08-12 6af64892d593303fed386e468347c2ff41ab99b6

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

@@ -1,10 +1,10 @@
package com.hz.his.feign.service.platform;

import com.hx.phiappt.model.order.OrdersTotal;
import com.hx.phip.dto.order.OrderCreateDto;
import com.hx.phip.dto.order.OrderPayDto;
import com.hx.phip.dto.order.OrderRefundDto;
import com.hx.resultTool.Result;
import com.hz.his.dto.order.OrderCreateDto;
import com.hz.his.dto.order.OrderPayDto;
import com.hz.his.dto.order.OrderRefundDto;
import com.hz.his.dto.order.OrdersTotalDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,7 +25,7 @@
     * 开放平台-新-订单状态更新至phis
     */
    @PostMapping(value = "/newSync/order/orderUpdate")
    Result updateOrderStatus(@RequestBody OrdersTotal params);
    Result updateOrderStatus(@RequestBody OrdersTotalDto params);

    /**
     * 开放平台-新-订单结账更新至phis