Merge branch 'master-fwq积分限购' into master-test

fwq

2023-07-18 68df9ddab1b929c58ff5cf95c6487e9220397193

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

@@ -30,17 +30,23 @@
     * 根据商品id查询订单数量
     */
    @PostMapping(value = "/order/numByGoodsId")
    Result queryOrderNumByGoodsId(@RequestParam("goodsId") String goodsId);
    Result queryOrderNumByGoodsId(@RequestParam("goodsId") String goodsId,@RequestParam("userId") String userId);

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

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

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