Merge branch 'master-prod-new' into master-stander

fwq

2024-07-08 971eb04d09d950f7fa0d534560a76dd69d84c69c

 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;
@@ -10,7 +11,7 @@
/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name = "phis-provider", path = "/p-his-data", contextId = "order")
@FeignClient(name = "phi-platform-user", path = "/p-his-data", contextId = "order")
public interface SOrderService {

    /**
@@ -21,6 +22,7 @@

    /**
     * 订单详情
     * 转换用OrderDetailDt
     */
    @PostMapping(value = "/order/detail")
    Result orderDetail(@RequestParam("orderId") String orderId);
@@ -29,13 +31,23 @@
     * 根据商品id查询订单数量
     */
    @PostMapping(value = "/order/numByGoodsId")
    Result queryOrderNumByGoodsId(@RequestParam("goodsId") String goodsId);
    Result queryOrderNumByGoodsId(@RequestBody ActivityLimitDto activityLimitDto);

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

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

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