20220505

xiaoyong931011

2022-05-05 0b4988c286e556b26363bbd73e191492dc42674d

20220505

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

@@ -24,6 +24,7 @@
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.SysBedInfoDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.SysBedInfoService;
import com.matrix.system.hive.service.SysOrderService;
@@ -76,6 +77,12 @@
    @Resource
    private SysWorktimeService sysWorkTimeService;

    @Resource
    private SysUsersService usersService;

    @Autowired
    private SysBedInfoDao sysBedInfoDao;

    @Value("${login_public_key}")
    private String publicKey;

@@ -117,10 +124,6 @@
        return result;
    }


    @Resource
    private SysUsersService usersService;

    @ApiOperation(value = "首页", notes = "首页")
    @GetMapping(value = "/frist")
    public AjaxResult frist() {
@@ -142,10 +145,10 @@
        AjaxResult result = AjaxResult.buildSuccessInstance("");
        result.putInMap("orderList",padApiOrderListInPage);

        Date date = new Date();
        List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
        if(CollUtil.isNotEmpty(mls)){
            SysBeauticianState sysBeauticianState = new SysBeauticianState();
            Date date = new Date();
            sysBeauticianState.setBeginTime(DateUtil.getStartDate(date));
            sysBeauticianState.setEndTime(DateUtil.getStartDate(date));
            String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
@@ -169,7 +172,11 @@
        if(CollUtil.isNotEmpty(totalBed)){
            SysProjServices sysProjServices = new SysProjServices();
            sysProjServices.setShopId(getMe().getShopId());
            List<SysBedInfo> freeBed = bedInfoService.findFreeBed(sysProjServices);

            sysProjServices.setStartTime(DateUtil.getStartDate(date));
            sysProjServices.setEndTime(DateUtil.getStartDate(date));
            List<SysBedInfo> freeBed = sysBedInfoDao.findFreeBed(sysProjServices);
//            List<SysBedInfo> freeBed = bedInfoService.findFreeBed(sysProjServices);
            if(CollUtil.isNotEmpty(freeBed)){
                result.putInMap("usedBed", totalBed.size() - freeBed.size());
                result.putInMap("freeBed", freeBed);

 zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java

@@ -1,13 +1,30 @@
package com.matrix;

import cn.hutool.core.collection.CollUtil;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.BizUserDao;
import com.matrix.system.fenxiao.entity.BizUser;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.SysBedInfoDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.hive.service.*;
import com.matrix.system.padApi.dto.PadOrderListDto;
import com.matrix.system.padApi.vo.PadOrderDetailVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +32,9 @@
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;

@@ -41,6 +61,112 @@
    @Autowired
    SysVipInfoService sysVipInfoService;

    @Autowired
    private SysUsersService sysUsersService;

    @Autowired
    private DefaultAuthorityManager authorityManager;

    @Autowired
    SysShopInfoDao sysShopInfoDao;

    @Autowired
    SysCompanyDao sysCompanyDao;

    @Autowired
    private SysShopInfoService sysShopInfoService;

    @Resource
    private SysOrderService sysOrderService;

    @Resource
    private SysBedInfoService bedInfoService;

    @Resource
    private SysWorktimeService sysWorkTimeService;


    @Resource
    private SysUsersService usersService;

    @Autowired
    private SysUsersDao sysUsersDao;


    @Autowired
    private SysBedInfoDao sysBedInfoDao;

    @Test
    public void testFrist(){
        SysUsers user = new SysUsers();
        user.setShopId(13L);
        user.setCompanyId(17L);
//        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        PadOrderListDto orderListDto = new PadOrderListDto();
        orderListDto.setPageNum(1);
        orderListDto.setPageSize(5);
        int offset = (orderListDto.getPageNum() - 1) * orderListDto.getPageSize();
        int limit = orderListDto.getPageSize();
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);
//        if (!DataAuthUtil.hasAllShopAuth()) {
            orderListDto.setShopId(user.getShopId());
//        }
//        QueryUtil.setQueryLimitCom(orderListDto);
        List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);

        AjaxResult result = AjaxResult.buildSuccessInstance("");
        result.putInMap("orderList",padApiOrderListInPage);

//        List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
        user.setRoleName(Dictionary.STAFF_POST_MLS);
        List<SysUsers> mls = sysUsersDao.selectByRoleName(user);
        Date date = new Date();
        if(CollUtil.isNotEmpty(mls)){
            SysBeauticianState sysBeauticianState = new SysBeauticianState();
            sysBeauticianState.setBeginTime(DateUtil.getStartDate(date));
            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())){
                staffs= sysUsersService.findByCodeBeaStateShop(user.getShopId(),
                        sysBeauticianState, panBanCodes);
                if(CollUtil.isNotEmpty(staffs)){
                    result.putInMap("usedMls", mls.size() - staffs.size());
                    result.putInMap("freeMls", staffs.size());
                }else{
                    result.putInMap("usedMls", mls.size());
                    result.putInMap("freeMls", 0);
                }
            }
        }

        SysBedInfo bedInfo = new SysBedInfo();
        bedInfo.setShopId(user.getShopId());
        List<SysBedInfo> totalBed = bedInfoService.findByModel(bedInfo);
        if(CollUtil.isNotEmpty(totalBed)){
            SysProjServices sysProjServices = new SysProjServices();
            sysProjServices.setShopId(user.getShopId());

            sysProjServices.setStartTime(DateUtil.getStartDate(date));
            sysProjServices.setEndTime(DateUtil.getStartDate(date));
            List<SysBedInfo> freeBed = sysBedInfoDao.findFreeBed(sysProjServices);
            if(CollUtil.isNotEmpty(freeBed)){
                result.putInMap("usedBed", totalBed.size() - freeBed.size());
                result.putInMap("freeBed", freeBed);
            }else{
                result.putInMap("usedBed", totalBed);
                result.putInMap("freeBed", 0);
            }
        }
        System.out.println(result.toString());
    }
    public SysUsers getMe() {
        return (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);

    }

    @Test
    @Transactional
    public void addSettings(){