Merge branch 'master' into master-test

wangrenhuang

2023-11-06 155905061b3aa29d2aa23e5693e8704debfb9828

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

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

import com.hx.resultTool.Result;
import com.hz.his.dto.activity.ActivityLimitDto;
import com.hz.his.dto.order.OrderDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,9 +22,32 @@

    /**
     * 订单详情
     * 转换用OrderDetailDt
     */
    @PostMapping(value = "/order/detail")
    Result orderDetail(@RequestParam("orderId") String orderId);

    /**
     * 根据商品id查询订单数量
     */
    @PostMapping(value = "/order/numByGoodsId")
    Result queryOrderNumByGoodsId(@RequestBody ActivityLimitDto activityLimitDto);

    /**
     * 根据活动id查询订单数量
     */
    @PostMapping(value = "/order/numByActivityId")
    Result queryOrderNumByActivityId(@RequestBody ActivityLimitDto activityLimitDto);

    /**
     * 订单列表
     */
    @PostMapping(value = "/order/deta/all")
    Result getOrderDetasAll(@RequestBody OrderDto orderDto);

    /**
     * 订单列表
     */
    @PostMapping(value = "/getOrderCustomerConfirm")
    Result getOrderCustomerConfirm(@RequestBody OrderDto orderDto);
}