From 560228ac3c15cccce0b2a5994d44e4e81b5b3b73 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 11:12:22 +0800
Subject: [PATCH] 合并服务单订单改造分支
---
zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java | 82 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java b/zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java
index 06aea9e..3072c1d 100644
--- a/zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java
+++ b/zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java
@@ -1,7 +1,14 @@
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.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.dao.SysUsersDao;
@@ -9,6 +16,7 @@
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.*;
import com.matrix.system.hive.bean.MoneyCardUse;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.SysBedInfoDao;
@@ -16,6 +24,8 @@
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
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;
@@ -24,6 +34,8 @@
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;
@@ -101,6 +113,76 @@
moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
}
+ @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
--
Gitblit v1.9.1