Merge branch 'master' into master-test

zhangxu

2022-11-28 5e449fc5834aff0e4100a9defd93b5cb3c82b4cb

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.aduit.AduitDto;
import com.hz.his.dto.order.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -91,5 +92,43 @@
    @PostMapping(value = "/order/refundNote/confirm")
    Result noteConfirm(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);

    /**
     * 开放平台-查询订单支付集合
     */
    @PostMapping(value = "/order/get/ConsumePay")
    Result getConsumePay(@RequestBody PayDto dto);

    /**
     * 开放平台-营销助手订单折扣审核通过/拒绝接口
     */
    @PostMapping(value = "/audit/marketing/aduit")
    Result marketingAduit(@RequestBody AduitDto dto);

    /**
     * 开放平台-营销助手订单取消审核通过/拒绝接口
     */
    @PostMapping(value = "/audit/order/cancel")
    Result cancelApproval(@RequestBody AduitDto aduitDto);

    /**
     * 开放平台-开单
     * 实体转化用 CreateOrderReturnDto
     */
    @PostMapping(value = "/order/create")
    Result orderCreate(@RequestBody OrderPHisDto dto);

    /**
     * 开放平台-结账
     */
    @PostMapping(value = "/order/payMoney")
    Result orderPayMoney(@RequestBody PayDto dto);


    /**
     * 开放平台-部分退款
     * data 实体转化用 CancelOrderReturnDto
     */
    @PostMapping(value = "/order/partial/refund")
    Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);

}