Merge branch 'dev' into 'mp-server-test'

渠道订单列表

See merge request quanshu/mp-server!42

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -96,12 +96,13 @@ public class ChannelOrderController extends BaseApiController {
    */
   @PostMapping("/order/list")
   @ApiOperation(value = "订单列表" , notes = "获取所有订单信息")
-  public TableDataInfo list(@RequestBody ChannelOrder param) {
+  public TableDataInfo list(@RequestBody JSONObject param) {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
+    Integer status = param.getInteger("status");
     startPage();
     List<ChannelOrder> channelOrders = channelOrderService.list(
         new LambdaQueryWrapper<ChannelOrder>().eq(ChannelOrder::getChannelId, channelId)
-            .eq(null != param.getStatus(), ChannelOrder::getStatus, param.getStatus())
+            .eq(null != status, ChannelOrder::getStatus, status)
             .orderByDesc(ChannelOrder::getCreatedTime));
     List<ChannelOrderVO> channelOrderVOList = mapperFacade.mapAsList(channelOrders, ChannelOrderVO.class);
     for (ChannelOrderVO channelOrderVO : channelOrderVOList) {