Merge branch 'master' of http://115.29.66.169:10080/yiyao_shop/api

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

@@ -340,9 +340,17 @@ public class BusinessController extends BaseController {
         businessVoTableDataInfo.getRows().forEach(businessVo -> {
             BusinessDayBillCountBo businessDayBillCountBo = new BusinessDayBillCountBo();
             businessDayBillCountBo.setBusinessId(businessVo.getBusinessId());
+            businessDayBillCountBo.setType("all");
             BusinessDayBillVo statistics = businessDayBillService.getStatistics(businessDayBillCountBo);
             businessVo.setStatistics(statistics);
         });
         return businessVoTableDataInfo;
     }
+
+    @ApiOperation("下拉查连锁店")
+    @GetMapping("/partnerSelect")
+    public R<List<BusinessVo>> partnerSelect(@Validated(QueryGroup.class) BusinessBo bo) {
+        bo.setParentBusinessId(getBusinessId(true));
+        return R.ok(iBusinessService.querySlimList(bo));
+    }
 }

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

@@ -166,6 +166,7 @@ public class BusinessServiceImpl implements IBusinessService {
         lqw.like(StringUtils.isNotBlank(bo.getBusinessName()), Business::getBusinessName, bo.getBusinessName());
         lqw.eq(bo.getBusinessStatus() != null, Business::getBusinessStatus, bo.getBusinessStatus());
         lqw.eq(bo.getShelvedStatus() != null, Business::getShelvedStatus, bo.getShelvedStatus());
+        lqw.eq(bo.getParentBusinessId() != null, Business::getParentBusinessId, bo.getParentBusinessId());
         lqw.orderByDesc(Business::getOrderIndex);
         lqw.orderByDesc(Business::getCreateTime);
         return this.baseMapper.selectVoList(lqw);