商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/subsidy/SubsidyQueueController.java

@@ -57,7 +57,7 @@ public class SubsidyQueueController extends BaseController {
      * 获取当前商家的排队数量
      */
     @ApiOperation("获取当前商家的排队数量")
-    @GetMapping("/validQueueCount}")
+    @GetMapping("/validQueueCount")
     public R<Long> validQueueCount() {
         return R.ok(iSubsidyQueueService.validQueueCount(getBusinessId(true), false));
     }

ruoyi-shop/src/main/java/com/ruoyi/shop/product/service/impl/ProductStockFlowWaterServiceImpl.java

@@ -90,6 +90,7 @@ public class ProductStockFlowWaterServiceImpl implements IProductStockFlowWaterS
         lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ProductStockFlowWater::getOrderNo, bo.getOrderNo());
         lqw.eq(StringUtils.isNotBlank(bo.getRefundOrderNo()), ProductStockFlowWater::getRefundOrderNo, bo.getRefundOrderNo());
         lqw.eq(bo.getRefundOrderId() != null, ProductStockFlowWater::getRefundOrderId, bo.getRefundOrderId());
+        lqw.orderByDesc(ProductStockFlowWater::getCreateTime);
         return lqw;
     }