商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessController.java

@@ -363,10 +363,12 @@ public class BusinessController extends BaseController {
     public TableDataInfo<BusinessVo> chainPage(@Validated(QueryGroup.class) BusinessBo bo, PageQuery pageQuery) {
         Long id = iBusinessService.queryParentBusinessIdById(bo.getBusinessId());
         if (ObjectUtil.isNull(id)) {
-            return null;
+            //可能是总店
+            id = bo.getBusinessId();
         }
         BusinessBo queryBo = new BusinessBo();
         queryBo.setParentBusinessId(id);
+        queryBo.setCloseStatus(false);
         return iBusinessService.partnerPage(queryBo, pageQuery);
     }
 

ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BusinessBo.java

@@ -404,4 +404,9 @@ public class BusinessBo extends BaseEntity {
     @FilePathValue
     @ApiModelProperty(value = "商家结算信息")
     private BusinessSettlementBo settlementInfo;
+
+    /**
+     * 是否闭店
+     */
+    private Boolean closeStatus;
 }

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -199,6 +199,7 @@ public class BusinessServiceImpl implements IBusinessService {
         lqw.eq(bo.getShelvedStatus() != null, Business::getShelvedStatus, bo.getShelvedStatus());
         lqw.eq(bo.getHotStatus() != null, Business::getHotStatus, bo.getHotStatus());
         lqw.eq(bo.getParentBusinessId() != null, Business::getParentBusinessId, bo.getParentBusinessId());
+        lqw.eq(bo.getCloseStatus() != null, Business::getCloseStatus, bo.getCloseStatus());
         Date startTime = bo.getStartTime();
         if (ObjectUtil.isNotNull(startTime)) {
             lqw.ge(Business::getCreateTime, DateUtil.beginOfDay(startTime));