大屏接口bug修改

无关风月

7 小时以前 b5ead35c1d955f2a0e2e10da79254860d0ba95e9

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

@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
@@ -58,6 +59,8 @@
     */
    @GetMapping(value = "/order/detail")
    R<Order> detail(@RequestParam("id") String id);
    @PostMapping(value = "/order/msgCount")
    R msgCount(@RequestParam("orderId") String orderId);

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

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

    /**
     * 订单列表
     *
@@ -146,6 +152,9 @@

    @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);

    /**
     * 更改订单状态且清空到达时间
@@ -196,11 +205,13 @@
    @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(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(name = "pageSize", defaultValue = "10") Integer pageSize,
                                 @RequestParam("siteIds") String [] siteIds);

    /**
     * 更改订单提现状态
@@ -233,7 +244,7 @@
     * @return 交易额
     */
    @GetMapping(value = "/order/orderListWorker")
    R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,
    R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues,
                                   @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);

@@ -415,5 +426,38 @@
    R<String> oldData(@RequestParam("index") Integer index,
                      @RequestParam("pageNum") Integer pageNum,
                      @RequestParam("pageSize") Integer pageSize);
    @GetMapping(value = "/order/updateArrivalTime")
    R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime);

    /**
     * 批量修改上门时间
     * @param ids
     * @param time
     * @return
     */
    @GetMapping(value = "/order/batchUpdateTime")
    R<Boolean> batchUpdateTime(@RequestParam("ids")String ids,@RequestParam("time")String time);
    /**
     * 打电话
     * @param orderId
     * @return
     */
    @GetMapping(value = "/order/call")
    R<String> call(@RequestParam("orderId")String orderId);

    /**
     * 领取补贴金
     * @param orderId
     * @param recycleSubsidy
     * @return
     */
    @GetMapping(value = "/order/receiving")
    R<String> receiving(@RequestParam("orderId")String orderId, @RequestParam("recycleSubsidy")BigDecimal recycleSubsidy);

    /**
     * 今日订单数据
     * @return
     */
    @GetMapping(value = "/order/getTodayOrderData")
    R<List<Order>> getTodayOrderData();
}