20220505

xiaoyong931011

2022-05-05 03f20f2541342349fbabf6a59e7e450f50ba3e61

20220505

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -517,7 +517,14 @@

    @Override
    public List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo) {
        return sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo);
        List<PadOrderDetailVo> padOrderDetailVos = sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo);
        if(CollUtil.isNotEmpty(padOrderDetailVos)){
            for(PadOrderDetailVo padOrderDetailVo : padOrderDetailVos){
                padOrderDetailVo.setItems(orderItemDao.selectApiOrderDetailItemsByOrderId(Long.parseLong(padOrderDetailVo.getOrderId())));
            }
        }

        return padOrderDetailVos;
    }

    @Override

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java

@@ -162,6 +162,7 @@
        shopstaffInfo.setShopId(user.getShopId());
        shopstaffInfo.setRoleName(Dictionary.STAFF_POST_MLS);
        List<SysUsers> mls = sysUsersDao.selectByRoleName(shopstaffInfo);
        LogUtil.info("美疗师 size={}", mls.size());
//        List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
        if(CollUtil.isNotEmpty(mls)){
            SysBeauticianState sysBeauticianState = new SysBeauticianState();
@@ -169,7 +170,7 @@
            sysBeauticianState.setEndTime(DateUtil.getStartDate(date));
            String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
            List<SysUsers> staffs=new ArrayList<>();
            if(sysWorkTimeService.isInWorkTime(user.getShopId(),sysBeauticianState.getBeginTime(),sysBeauticianState.getEndTime())){
//            if(sysWorkTimeService.isInWorkTime(user.getShopId(),sysBeauticianState.getBeginTime(),sysBeauticianState.getEndTime())){
                staffs= sysUsersService.findByCodeBeaStateShop(user.getShopId(),
                        sysBeauticianState, panBanCodes);
                if(CollUtil.isNotEmpty(staffs)){
@@ -179,7 +180,7 @@
                    result.putInMap("usedMls", mls.size());
                    result.putInMap("freeMls", 0);
                }
            }
//            }
        }

        SysBedInfo bedInfo = new SysBedInfo();