Merge remote-tracking branch 'origin/dev' into dev

pz-admin/src/main/java/com/pz/web/controller/system/DataViewController.java

@@ -10,6 +10,8 @@ import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.dto.RoleDTO;
 import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.page.TableDataInfo;
+import com.pz.merchant.domain.bo.CompanyBo;
+import com.pz.merchant.domain.vo.CompanyVo;
 import com.pz.system.domain.bo.DbghOrderBo;
 import com.pz.system.domain.bo.OrderColumnarBo;
 import com.pz.system.domain.vo.DbghOrderVo;
@@ -61,6 +63,7 @@ public class DataViewController extends BaseController {
 
     private final IStoreApplyService iStoreApplyService;
 
+
     /**
      * 新增用户统计
      */
@@ -75,7 +78,7 @@ public class DataViewController extends BaseController {
     @GetMapping("/dataEmployees")
     public R<DataViewVo> dataEmployees(DataViewBo dataViewBo) {
         Long roleId = getLoginUser().getRoleId();
-        if(null != roleId && roleId == 3){
+        if (null != roleId && roleId == 3) {
             dataViewBo.setUserId(getUserId());
         }
         return R.ok(iEmployeesService.dataEmployees(dataViewBo));
@@ -111,7 +114,7 @@ public class DataViewController extends BaseController {
     @GetMapping("/platformRevenue")
     public R<DataOrderVo> platformRevenue(DataViewBo dataViewBo) {
         Long roleId = getLoginUser().getRoleId();
-        if(null != roleId && roleId == 3){
+        if (null != roleId && roleId == 3) {
             dataViewBo.setUserId(getUserId());
         }
         return R.ok(iTotalOrderService.platformRevenue(dataViewBo));
@@ -123,7 +126,7 @@ public class DataViewController extends BaseController {
     @GetMapping("/orderQuantity")
     public R<DataViewVo> orderQuantity(DataViewBo dataViewBo) {
         Long roleId = getLoginUser().getRoleId();
-        if(null != roleId && roleId == 3){
+        if (null != roleId && roleId == 3) {
             dataViewBo.setUserId(getUserId());
         }
         DataOrderVo dataOrderVo = iTotalOrderService.orderQuantity(dataViewBo);
@@ -140,4 +143,14 @@ public class DataViewController extends BaseController {
         OrderColumnarBo bo) {
         return R.ok(iTotalOrderService.findOrderColumnarVoList(bo));
     }
+
+
+    /**
+     * 机构列表
+     */
+    @GetMapping("/companyList")
+    public R<List<CompanyVo>> companyList(
+        CompanyBo bo) {
+        return R.ok(iCompanyService.queryList(bo));
+    }
 }

pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java

@@ -119,6 +119,7 @@ public class CompanyServiceImpl implements ICompanyService {
         LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
         lqw.eq(null != bo.getStatus(), Company::getStatus,1);
         lqw.eq(null != bo.getUid(), Company::getUid,bo.getUid());
+        lqw.eq(null != bo.getCityId(),Company::getCityId,bo.getCityId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), Company::getName, bo.getName());
         return lqw;
     }

pz-system/src/main/java/com/pz/system/domain/bo/OrderColumnarBo.java

@@ -28,4 +28,14 @@ public class OrderColumnarBo implements Serializable {
      * 陪诊员ids
      */
     private List<Integer> emIds;
+
+    /**
+     * 城市id
+     */
+    private Long cityId;
+
+    /**
+     * 机构id
+     */
+    private Long companyId;
 }

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -1248,20 +1248,6 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
     public List<OrderLineVo> findOrderColumnarVoList(OrderColumnarBo bo) {
         Long roleId = LoginHelper.getLoginUser().getRoleId();
         Long userId = LoginHelper.getUserId();
-        //商户
-        if (roleId == 3L) {
-            //查找该商户
-            Optional.ofNullable(companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getUid, userId).eq(Company::getStatus, 1)))
-                .ifPresent(company -> {
-                    //获取该商户下所有陪诊员
-                    List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().eq(Employees::getCompanyId, company.getId()));
-                    if (CollectionUtils.isNotEmpty(employees)) {
-                        bo.setEmIds(employees.stream().map(Employees::getId).collect(Collectors.toList()));
-                    } else {
-                        bo.setEmIds(Arrays.asList(999999));
-                    }
-                });
-        }
         List<OrderLineVo> list = new ArrayList<>();
         List<String> recentDates;
         switch (bo.getType()) {
@@ -1277,16 +1263,36 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             default:
                 return list;
         }
+        // 获取商户和陪诊员信息
+        if (roleId == 3L) {
+            Optional.ofNullable(companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getUid, userId).eq(Company::getStatus, 1)))
+                .ifPresent(company -> {
+                    List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().eq(Employees::getCompanyId, company.getId()));
+                    bo.setEmIds(CollectionUtils.isNotEmpty(employees) ? employees.stream().map(Employees::getId).collect(Collectors.toList()) : Arrays.asList(999999));
+                });
+        }
+
+        // 获取该城市下所有陪诊员信息
+        if (bo.getCityId() != null) {
+            List<Company> companies = companyMapper.selectList(Wrappers.<Company>lambdaQuery().eq(Company::getCityId, bo.getCityId()).eq(null != bo.getCompanyId(), Company::getId, bo.getCompanyId()).eq(Company::getStatus, 1));
+            if (CollectionUtils.isNotEmpty(companies)) {
+                List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().in(Employees::getCompanyId, companies.stream().map(Company::getId).collect(Collectors.toList())));
+                bo.setEmIds(CollectionUtils.isNotEmpty(employees) ? employees.stream().map(Employees::getId).collect(Collectors.toList()) : Arrays.asList(999999));
+            } else {
+                bo.setEmIds(Arrays.asList(999999));
+            }
+        }
+
         // 使用一个 Map 来缓存已经查询过的订单列列表
         Map<String, List<OrderColumnarVo>> orderMap = new HashMap<>();
         for (String time : recentDates) {
-            List<OrderColumnarVo> orderColumnarVoList = orderMap.get(time);
-            if (orderColumnarVoList == null) {
-                orderColumnarVoList = baseMapper.findOrderColumnarVoList(time, bo.getEmIds());
+            List<OrderColumnarVo> orderColumnarVoList = orderMap.computeIfAbsent(time, k -> {
+                List<OrderColumnarVo> columnarVoList = baseMapper.findOrderColumnarVoList(time, bo.getEmIds());
                 OrderColumnarVo orderColumnarVo = baseMapper.findStoreOrderVoList(time, bo.getEmIds());
-                orderColumnarVoList.add(orderColumnarVo);
-                orderMap.put(time, orderColumnarVoList);
-            }
+                columnarVoList.add(orderColumnarVo);
+                return columnarVoList;
+            });
+
             OrderLineVo orderLineVo = new OrderLineVo();
             orderLineVo.setKey(time);
             orderLineVo.setList(orderColumnarVoList);
@@ -1437,7 +1443,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
 
     @Override
     public DataOrderVo platformRevenue(DataViewBo dataViewBo) {
-        if(null != dataViewBo.getUserId()){
+        if (null != dataViewBo.getUserId()) {
             Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, dataViewBo.getUserId()));
             dataViewBo.setUserId(company.getId().longValue());
             return baseMapper.selectPlatformCom(dataViewBo);