Merge branch 'master-zhangxu'

zhangxu

2022-11-10 22a2b7000a034a46e7112a061785ba19751ffc25

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

@@ -1,11 +1,10 @@
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;

@@ -16,31 +15,31 @@
public interface SPhipOrderService {

    /**
     * 开放平台-新-新增订单更新至phis
     * 开放平台-新-新增订单更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/add")
    Result createOrder(@RequestBody OrderCreateDto params);

    /**
     * 开放平台-新-订单状态更新至phis
     * 开放平台-新-订单状态更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/orderUpdate")
    Result updateOrderStatus(@RequestBody OrdersTotalDto params);

    /**
     * 开放平台-新-订单结账更新至phis
     * 开放平台-新-订单结账更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/pay")
    Result payOrderSuc(@RequestBody OrderPayDto params);

    /**
     * 开放平台-新-订单退款更新至phis
     * 开放平台-新-订单退款更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/refund")
    Result refundOrder(@RequestBody OrderRefundDto params);

    /**
     * 开放平台-新-取消订单更新至phis
     * 开放平台-新-取消订单更新至phis (废弃)
     */
    @PostMapping(value = "/newSync/order/cancel")
    Result cancelOrder(@RequestBody OrderRefundDto params);
@@ -54,13 +53,61 @@

    /**
     * 开放平台-开单
     * 实体转化用 CreateOrderReturnDto
     */
    @PostMapping(value = "/order/add")
    Result orderAdd(HttpServletRequest request, @RequestBody OrderPHisDto dto);
    Result orderAdd(@RequestBody OrderPHisDto dto);

    /**
     * 开放平台-结账
     */
    @PostMapping(value = "/order/pay")
    Result orderPay(HttpServletRequest request,@RequestBody PayDto dto);
    Result orderPay(@RequestBody PayDto dto);

    /**
     * 开放平台-用户确认订单
     */
    @PostMapping(value = "/order/customer/confirm")
    Result customerConfirm(@RequestBody OrderInfoDto orderInfoDto);

    /**
     * 开放平台-判断订单是否支持取消已支付的订单
     */
    @PostMapping(value = "/order/cancel/verification")
    Result cancelVerification(@RequestBody CancelOrderDto cancelOrderDto);
    /**
     * 开放平台-取消订单（新）
     * data 实体转化用 CancelOrderReturnDto
     */
    @PostMapping(value = "/order/cancel/v3")
    Result cancel(@RequestBody CancelOrderDto cancelOrderDto);
     /**
     * 开放平台-根据订单id获取退款单信息
     */
    @PostMapping(value = "/order/refundNote/list")
    Result noteList(@RequestBody OrderRefundNoteListDto orderRefundNoteListDto);
    /**
     * 开放平台-确认退款单
     */
    @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);

}