~jiangyouyao/beauty-erp.git

			@@ -1,27 +1,19 @@
			package com.matrix.system.shopXcx.api.action;

			import com.matrix.biz.bean.BizUser;
			import com.matrix.biz.dao.BizUserDao;
			import com.matrix.system.hive.bean.SysVipInfo;
			import com.matrix.system.hive.dao.SysVipInfoDao;
			import com.matrix.component.rabbitmq.RabiitMqTemplate;
			import com.matrix.component.redis.RedisUserLoginUtils;
			import com.matrix.core.constance.MatrixConstance;
			import com.matrix.core.exception.GlobleException;
			import com.matrix.core.pojo.AjaxResult;
			import com.matrix.core.pojo.PaginationVO;
			import com.matrix.core.pojo.VerifyResult;
			import com.matrix.core.tools.DateUtil;
			import com.matrix.core.tools.LogUtil;
			import com.matrix.core.tools.StringUtils;
			import com.matrix.core.tools.WebUtil;
			import com.matrix.system.app.dto.ServiceOrderListDto;
			import com.matrix.system.app.mapper.SysBeauticianStateMapper;
			import com.matrix.system.app.mapper.SysProjServiceMapper;
			import com.matrix.system.app.mapper.SysProjUseMapper;
			import com.matrix.system.app.vo.*;
			import com.matrix.system.common.bean.SysUsers;
			import com.matrix.system.common.dao.SysUsersDao;
			import com.matrix.system.common.interceptor.HostInterceptor;
			import com.matrix.system.common.tools.DataAuthUtil;
			import com.matrix.system.common.tools.LocationUtil;
			import com.matrix.system.constance.Dictionary;
			import com.matrix.system.hive.bean.*;
			@@ -30,14 +22,11 @@
			import com.matrix.system.hive.service.*;
			import com.matrix.system.shopXcx.api.dto.ErpServiceCommentDto;
			import com.matrix.system.shopXcx.api.dto.ErpServiceOrderListDto;
			import com.matrix.system.shopXcx.api.vo.ErpOrderDetailItemVo;
			import com.matrix.system.shopXcx.api.vo.ErpServiceOrderListVo;
			import com.matrix.system.shopXcx.bean.ShopProduct;
			import com.matrix.system.shopXcx.dao.ShopProductDao;
			import com.matrix.system.shopXcx.dao.ShopSkuDao;
			import com.matrix.system.shopXcx.dto.YYDayOfWeek;
			import com.matrix.system.shopXcx.dto.YYmonth;
			import com.matrix.system.shopXcx.mqTask.DTO.UserProjInfo;
			import io.swagger.annotations.*;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			@@ -86,7 +75,7 @@
			SysUsersDao staffInfoDao;

			@Autowired
			BizUserDao bizUserDao;
			SysVipInfoDao sysVipInfoDao;

			@Autowired
			RabiitMqTemplate rabiitMqTemplate;
			@@ -245,7 +234,7 @@

			if (CollectionUtils.isNotEmpty(serviceTcVos)) {
			serviceTcVos.forEach(item -> {
			List<SysProjUse> sysProjUses = projUseService.selectTaocanProjUse(item.getId());
			List<SysProjUse> sysProjUses = projUseService.selectTaocanProjUse(item.getId(), queryUse.getStatus());
			List<ServiceProjVo> taocanProj = SysProjUseMapper.INSTANCE.entityListToProjVoList(sysProjUses);
			item.setProj(taocanProj);
			});
			@@ -271,8 +260,8 @@
			@RequestMapping(value = "/createServiceOrder")
			public @ResponseBody
			AjaxResult createServiceOrder(@RequestBody Onlinebooking onlinebooking) {
			BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
			SysVipInfo vipInfo = vipInfoDao.selectByPhone(bizUser.getPhoneNumber());
			SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo vipInfo = vipInfoDao.selectByPhone(sysVipInfo.getPhone());
			SysProjUse sysProjUse = projUseDao.selectById(Long.parseLong(onlinebooking.getProductId() + ""));
			Date yyTime = DateUtil.stringToDate(onlinebooking.getTimeStr(), DateUtil.DATE_FORMAT_MM);
			SysProjServices sysProjServices = new SysProjServices();
			@@ -358,8 +347,8 @@
			@PostMapping(value = "/getServiceOrderList")
			@ResponseBody
			public AjaxResult findServiceOrderList(@RequestBody @Validated ErpServiceOrderListDto orderListDto) {
			BizUser bizUser = redisUserLoginUtils.getLoginUser(BizUser.class);
			SysVipInfo vipInfo= vipInfoDao.selectByPhone(bizUser.getPhoneNumber());
			SysVipInfo sysVipInfo = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
			SysVipInfo vipInfo= vipInfoDao.selectByPhone(sysVipInfo.getPhone());
			orderListDto.setVipId(vipInfo.getId());
			List<ErpServiceOrderListVo> apiServiceOrderListInPage = projServicesDao.findWxServiceOrderList(orderListDto);
			return AjaxResult.buildSuccessInstance(apiServiceOrderListInPage,"查询成功");