|
@@ -19,8 +19,15 @@ import cn.hutool.core.util.StrUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import io.swagger.v3.oas.annotations.media.Schema;
|
|
|
|
+import jakarta.annotation.Resource;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
+import vip.xiaonuo.biz.modular.customer.entity.BizCustomer;
|
|
|
|
+import vip.xiaonuo.biz.modular.goodsConf.entity.BizGoodsConf;
|
|
|
|
+import vip.xiaonuo.biz.modular.goodsConf.service.BizGoodsConfService;
|
|
|
|
+import vip.xiaonuo.biz.modular.user.mapper.BizUserMapper;
|
|
|
|
+import vip.xiaonuo.biz.modular.user.service.BizUserService;
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
@@ -31,7 +38,9 @@ import vip.xiaonuo.biz.modular.bizloadtime.param.BizLoadTimeEditParam;
|
|
import vip.xiaonuo.biz.modular.bizloadtime.param.BizLoadTimeIdParam;
|
|
import vip.xiaonuo.biz.modular.bizloadtime.param.BizLoadTimeIdParam;
|
|
import vip.xiaonuo.biz.modular.bizloadtime.param.BizLoadTimePageParam;
|
|
import vip.xiaonuo.biz.modular.bizloadtime.param.BizLoadTimePageParam;
|
|
import vip.xiaonuo.biz.modular.bizloadtime.service.BizLoadTimeService;
|
|
import vip.xiaonuo.biz.modular.bizloadtime.service.BizLoadTimeService;
|
|
|
|
+import vip.xiaonuo.sys.api.SysUserApi;
|
|
|
|
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -43,9 +52,21 @@ import java.util.List;
|
|
@Service
|
|
@Service
|
|
public class BizLoadTimeServiceImpl extends ServiceImpl<BizLoadTimeMapper, BizLoadTime> implements BizLoadTimeService {
|
|
public class BizLoadTimeServiceImpl extends ServiceImpl<BizLoadTimeMapper, BizLoadTime> implements BizLoadTimeService {
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private BizUserMapper bizUserMapper;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ private SysUserApi sysUserApi;
|
|
|
|
+
|
|
|
|
+ @Resource
|
|
|
|
+ private BizGoodsConfService bizGoodsConfService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Page<BizLoadTime> page(BizLoadTimePageParam bizLoadTimePageParam) {
|
|
public Page<BizLoadTime> page(BizLoadTimePageParam bizLoadTimePageParam) {
|
|
QueryWrapper<BizLoadTime> queryWrapper = new QueryWrapper<BizLoadTime>().checkSqlInjection();
|
|
QueryWrapper<BizLoadTime> queryWrapper = new QueryWrapper<BizLoadTime>().checkSqlInjection();
|
|
|
|
+ if(ObjectUtil.isNotEmpty(bizLoadTimePageParam.getLoadPointId())) {
|
|
|
|
+ queryWrapper.lambda().eq(BizLoadTime::getPointId, bizLoadTimePageParam.getLoadPointId());
|
|
|
|
+ }
|
|
if(ObjectUtil.isAllNotEmpty(bizLoadTimePageParam.getSortField(), bizLoadTimePageParam.getSortOrder())) {
|
|
if(ObjectUtil.isAllNotEmpty(bizLoadTimePageParam.getSortField(), bizLoadTimePageParam.getSortOrder())) {
|
|
CommonSortOrderEnum.validate(bizLoadTimePageParam.getSortOrder());
|
|
CommonSortOrderEnum.validate(bizLoadTimePageParam.getSortOrder());
|
|
queryWrapper.orderBy(true, bizLoadTimePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
|
|
queryWrapper.orderBy(true, bizLoadTimePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
|
|
@@ -83,6 +104,28 @@ public class BizLoadTimeServiceImpl extends ServiceImpl<BizLoadTimeMapper, BizLo
|
|
return this.queryEntity(bizLoadTimeIdParam.getId());
|
|
return this.queryEntity(bizLoadTimeIdParam.getId());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public List<BizLoadTime> search(BizLoadTimePageParam bizLoadTimePageParam) {
|
|
|
|
+ /** 点位ID */
|
|
|
|
+ String loadPointId = bizLoadTimePageParam.getLoadPointId();
|
|
|
|
+ /** 提货时间配置ID */
|
|
|
|
+ String goodsConfId = bizLoadTimePageParam.getGoodsConfId();
|
|
|
|
+ // 判断参数是否存在
|
|
|
|
+ if(loadPointId != null && goodsConfId != null) {
|
|
|
|
+ // 获取提货时间段
|
|
|
|
+ BizGoodsConf bizGoodsConf = bizGoodsConfService.queryEntity(goodsConfId);
|
|
|
|
+ // 开始时间
|
|
|
|
+ Date startTime = bizGoodsConf.getConfStartTime();
|
|
|
|
+ // 结束时间
|
|
|
|
+ Date endTime = bizGoodsConf.getConfEndTime();
|
|
|
|
+ // 根据时间段和装货点位ID过滤装货时间配置
|
|
|
|
+ List<BizLoadTime> list = this.baseMapper.getSearch(loadPointId, startTime, endTime);
|
|
|
|
+ return list;
|
|
|
|
+ }else{
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public BizLoadTime queryEntity(String id) {
|
|
public BizLoadTime queryEntity(String id) {
|
|
BizLoadTime bizLoadTime = this.getById(id);
|
|
BizLoadTime bizLoadTime = this.getById(id);
|