8.9

luodangjia

2024-09-06 3701dcb2483643ac40d4b81c021b3d8cdab62402

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.vo.PaperInVo;
import com.ruoyi.common.core.vo.Path;
import com.ruoyi.order.api.entity.*;
import com.ruoyi.order.api.factory.OrderFallbackFactory;
@@ -35,6 +36,10 @@
    @PostMapping(value = "/order/save")
    R<Boolean> save(@RequestBody OrderRequest orderRequest);


    @PostMapping(value = "/order/edit")
    R<Boolean> edit(@RequestBody OrderRequest orderRequest);

    /**
     * 根据改派申请id获取订单详情
     *
@@ -53,6 +58,8 @@
     */
    @GetMapping(value = "/order/detail")
    R<Order> detail(@RequestParam("id") String id);
    @PostMapping(value = "/order/msgCount")
    R msgCount(@RequestParam("orderId") String orderId);

    /**
     * 更改订单信息
@@ -114,6 +121,9 @@
    @PostMapping(value = "/order/queryPage")
    R<Page<Order>> queryPage(@RequestBody OrderQueryRequest orderQueryRequest);

    @PostMapping(value = "/order/queryPage1")
    R<List<String>> queryPage1(@RequestBody OrderQueryRequest orderQueryRequest);

    /**
     * 订单列表
     *
@@ -132,6 +142,18 @@
     */
    @PostMapping(value = "/order/updateState")
    R<Boolean> updateState(@RequestParam("orderId") String orderId, @RequestParam("state") Integer state);

    @PostMapping(value = "/order/count")
    R<Boolean> count(@RequestParam("orderId") String orderId);

    @PostMapping(value = "/order/papercount")
    R<List<PaperInVo>> papercount(@RequestParam("workId") String workId,@RequestParam("date") String date);

    @PostMapping(value = "/order/queryIdsBycode")
    R<List<Integer>> queryIdsBycode(@RequestBody List<String> cityList);

    @PostMapping(value = "/order/queryIdsBycodeAndSite")
    R<List<Integer>> queryIdsBycodeAndSite(@RequestParam("cityList") List<String> cityList,@RequestParam("siteIds")List<String> siteIds);

    /**
     * 更改订单状态且清空到达时间
@@ -163,6 +185,9 @@
    @PostMapping(value = "/order/orderCountHome")
    R<OrderResultVO> orderCountHome(@RequestBody OrderCountRequest orderCount);

    @PostMapping(value = "/order/workday")
    R<List<Order>> workday(@RequestBody Integer workId);

    /**
     * 用户所关联订单记录分页列表
     *
@@ -172,9 +197,20 @@
     * @return 分页列表
     */
    @GetMapping(value = "/order/orderList")
    R<IPage<Order>> orderList(@RequestParam("userId") Integer userId,
    R<Page<Order>> orderList(@RequestParam("userId") Integer userId,
                              @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);

    @GetMapping(value = "/order/orderList1")
    R<Page<Order>> orderList1(@RequestParam("userId") Integer userId, @RequestParam("cityList") List<String> cityList,
                             @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                              @RequestParam("siteIds") List<String> siteIds);
    @GetMapping(value = "/order/workOrderList")
    R<Page<Order>> workOrderList(@RequestParam("workId") Integer workId,
                             @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                 @RequestParam("siteIds") String [] siteIds);

    /**
     * 更改订单提现状态
@@ -195,8 +231,7 @@
     * @return 交易额
     */
    @GetMapping(value = "/order/tradeMoney")
    R<BigDecimal> tradeMoney(@RequestParam("cityList") List<String> cityList,
                             @RequestParam("type") String type);
    R<BigDecimal> tradeMoney(@RequestBody MoneyQueryRequest moneyQueryRequest);

    /**
     * 师傅端-订单列表