dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/line/OnlineOrderController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.Map;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
@@ -84,7 +85,12 @@ public class OnlineOrderController extends BaseController {
     public TableDataInfo<OnlineOrderVo> chainBusinessPage(@Validated(QueryGroup.class) OnlineOrderBo bo, PageQuery pageQuery) {
         if(ObjectUtil.isNull(bo.getBusinessId()))
         {
-            bo.setChainBusinessIds(iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true)));
+            List<Long> ids = iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true));
+            if(CollectionUtil.isEmpty(ids))
+            {
+                ids.add(0L);
+            }
+            bo.setChainBusinessIds(ids);
         }
         return iOnlineOrderService.queryCustomPageList(bo, pageQuery);
     }
@@ -144,7 +150,12 @@ public class OnlineOrderController extends BaseController {
     public void chainBusinessExport(@Validated OnlineOrderBo bo, HttpServletResponse response) {
         if(ObjectUtil.isNull(bo.getBusinessId()))
         {
-            bo.setChainBusinessIds(iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true)));
+            List<Long> ids = iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true));
+            if(CollectionUtil.isEmpty(ids))
+            {
+                ids.add(0L);
+            }
+            bo.setChainBusinessIds(ids);
         }
         List<OnlineOrderVo> list = iOnlineOrderService.queryCustomList(bo);
         ExcelUtil.exportExcel(list, "在线订单", OnlineOrderVo.class, response);
@@ -163,22 +174,19 @@ public class OnlineOrderController extends BaseController {
     @GetMapping("/chain-business-statistics/{businessId}")
     public R<Map<String, Object>> chainBusinessStatistics(@PathVariable("businessId") Long businessId) {
 
-        if(ObjectUtil.isNull(businessId))
+        if(ObjectUtil.isNotNull(businessId))
         {
-            throw new RuntimeException("请选择连锁店");
+            return R.ok( businessStatistics(businessId));
+        }
+        else
+        {
+            return R.ok(chainBusinessStatistics(iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true))));
         }
-        return R.ok( businessStatistics(businessId));
-    }
-
-    @ApiOperation("连锁店获取总的补贴排队统计")
-    @SaCheckPermission("subsidy:subsidyQueue:chainBusinessTotalStatistics")
-    @GetMapping("/chain-business-total-statistics")
-    public R<Map<String, Object>> chainBusinessTotalStatistics() {
 
-        return R.ok( chainBusinessStatistics(iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true))));
     }
 
 
+
     @ApiOperation("店铺获取补贴排队统计")
     @SaCheckPermission("subsidy:subsidyQueue:businessStatistics")
     @GetMapping("/business-statistics")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/order/ShopOrderController.java

@@ -3,11 +3,13 @@ package com.ruoyi.web.controller.shop.order;
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.util.DateUtils;
+import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -39,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.activation.MimetypesFileTypeMap;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.*;
@@ -61,6 +64,7 @@ public class ShopOrderController extends BaseController {
 
     private final IShopOrderService iShopOrderService;
     private final ISaleRightsOrderService rightsOrderService;
+    private final IBusinessService iBusinessService;
 
     private final ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
@@ -113,9 +117,15 @@ public class ShopOrderController extends BaseController {
     @SaCheckPermission("order:shopOrder:chainPlatformPage")
     @GetMapping("/chain-page")
     public TableDataInfo<ShopOrderVo> chainPage(@Validated(QueryGroup.class) ShopOrderBo bo, PageQuery pageQuery) {
-        if (ObjectUtil.isNull(bo.getBusinessId())) {
-            throw new RuntimeException("请选择连锁店");
+        if(bo.getBusinessId() == null) {
+            List<Long> ids = iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true));
+            if (CollectionUtil.isEmpty(ids)) {
+                ids.add(0L);
+            }
+            bo.setBusinessIds(ids);
         }
+
+
         bo.setOrderType(OrderType.NORMAL);
         if(ObjectUtil.isNotNull(bo.getStartTime()))
         {
@@ -517,13 +527,47 @@ public class ShopOrderController extends BaseController {
     }
 
     /**
-     * 导出订单列表
+     * 平台导出订单列表
      */
-    @ApiOperation("导出订单列表")
+    @ApiOperation("平台导出订单列表")
     @SaCheckPermission("order:shopOrder:export")
     @Log(title = "订单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public void export(@Validated ShopOrderBo bo, HttpServletResponse response) throws Exception {
+        exportHandle(bo, response);
+    }
+
+    /**
+     * 店铺导出订单列表
+     */
+    @ApiOperation("店铺导出订单列表")
+    @SaCheckPermission("order:shopOrder:businessExport")
+    @Log(title = "订单", businessType = BusinessType.EXPORT)
+    @GetMapping("/businessExport")
+    public void businessExport(@Validated ShopOrderBo bo, HttpServletResponse response) throws Exception {
+        bo.setBusinessId(getBusinessId(true));
+        exportHandle(bo, response);
+    }
+
+    /**
+     * 总店导出连锁店订单列表
+     */
+    @ApiOperation("导出订单列表")
+    @SaCheckPermission("order:shopOrder:chainExport")
+    @Log(title = "订单", businessType = BusinessType.EXPORT)
+    @GetMapping("/chainExport")
+    public void chainExport(@Validated ShopOrderBo bo, HttpServletResponse response) throws Exception {
+        if(bo.getBusinessId() == null) {
+            List<Long> ids = iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true));
+            if (CollectionUtil.isEmpty(ids)) {
+                ids.add(0L);
+            }
+            bo.setBusinessIds(ids);
+        }
+        exportHandle(bo, response);
+    }
+
+    private void exportHandle(ShopOrderBo bo, HttpServletResponse response) throws IOException {
         bo.setOrderType(OrderType.NORMAL);
         if(ObjectUtil.isNotNull(bo.getStartTime()))
         {

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

@@ -4,6 +4,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.common.excel.ExcelResult;
 import com.ruoyi.common.excel.ImportMessage;
 import com.ruoyi.subsidy.SubsidyQueueImportListener;
@@ -49,6 +50,7 @@ import org.springframework.web.multipart.MultipartFile;
 public class SubsidyQueueController extends BaseController {
 
     private final ISubsidyQueueService iSubsidyQueueService;
+    private final IBusinessService iBusinessService;
 
 
     /**
@@ -108,6 +110,25 @@ public class SubsidyQueueController extends BaseController {
         return iSubsidyQueueService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 总店查询连锁店排队订单（补贴排队列表）
+     */
+    @ApiOperation("总店查询连锁店排队订单（补贴排队列表）")
+    @SaCheckPermission("subsidy:subsidyQueue:chainPage")
+    @GetMapping("/chainPage")
+    public TableDataInfo<SubsidyQueueVo> chainPage(@Validated(QueryGroup.class) SubsidyQueueBo bo, PageQuery pageQuery) {
+        if(bo.getCurrentBusinessId() == null)
+        {
+            List<Long> ids = iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true));
+            if(CollectionUtil.isEmpty(ids))
+            {
+                ids.add(0L);
+            }
+            bo.setChainBusinessIds(ids);
+        }
+        return iSubsidyQueueService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 获取补贴排队详细信息
      */
@@ -178,6 +199,24 @@ public class SubsidyQueueController extends BaseController {
         ExcelUtil.exportExcel(list, "排队订单", SubsidyQueueVo.class, response);
     }
 
+    /**
+     * 总店导出连锁店补贴排队列表
+     */
+    @ApiOperation("总店导出连锁店补贴排队列表")
+    @SaCheckPermission("subsidy:subsidyQueue:chainExport")
+    @Log(title = "补贴排队", businessType = BusinessType.EXPORT)
+    @PostMapping("/chainExport")
+    public void chainExport(@Validated SubsidyQueueBo bo, HttpServletResponse response) {
+        if(bo.getCurrentBusinessId() == null) {
+            List<Long> ids = iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true));
+            if (CollectionUtil.isEmpty(ids)) {
+                ids.add(0L);
+            }
+        }
+        List<SubsidyQueueVo> list = iSubsidyQueueService.queryList(bo);
+        ExcelUtil.exportExcel(list, "排队订单", SubsidyQueueVo.class, response);
+    }
+
 
     @ApiOperation("导入补贴列表")
     @ApiImplicitParams({

ruoyi-line/src/main/java/com/ruoyi/subsidy/domain/bo/SubsidyQueueBo.java

@@ -18,6 +18,8 @@ import java.util.Date;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -281,4 +283,10 @@ public class SubsidyQueueBo extends BaseTimeEntity {
      */
     @ApiModelProperty(value = "排序的方向")
     private String isAsc = "asc";
+
+    /**
+     * 连锁商家IDs
+     */
+    @ApiModelProperty(value = "连锁商家IDs", required = true)
+    private List<Long> chainBusinessIds;
 }

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -163,6 +163,11 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
         lqw.like(StringUtils.isNotBlank(bo.getUserName()), SubsidyQueue::getUserName, bo.getUserName());
         lqw.like(StringUtils.isNotBlank(bo.getUserMobile()), SubsidyQueue::getUserMobile, bo.getUserMobile());
 
+        if(CollectionUtil.isNotEmpty(bo.getChainBusinessIds()))
+        {
+            lqw.in(SubsidyQueue::getCurrentBusinessId, bo.getChainBusinessIds());
+        }
+
         if (StringUtils.isNotBlank(bo.getKeyword())) {
             lqw.and(q -> q.like(SubsidyQueue::getOrderNo, bo.getKeyword())
                 .or().like(SubsidyQueue::getUserMobile, bo.getKeyword()));