DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物流处理 完成了顺丰api对接

Browse Source
This commit is contained in:
86156
2025-07-21 23:39:30 +08:00
parent ca0ec753c7
commit b1914b7edc
23 changed files with 1581 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaExpressQuestionService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaExpressQuestion;
import com.ruoyi.oa.domain.vo.OaExpressQuestionVo;
import com.ruoyi.oa.domain.bo.OaExpressQuestionBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 快递问题Service接口
*
* @author hdka
* @date 2025-07-21
*/
public interface IOaExpressQuestionService {
/**
* 查询快递问题
*/
OaExpressQuestionVo queryById(Long questionId);
/**
* 查询快递问题列表
*/
TableDataInfo<OaExpressQuestionVo> queryPageList(OaExpressQuestionBo bo, PageQuery pageQuery);
/**
* 查询快递问题列表
*/
List<OaExpressQuestionVo> queryList(OaExpressQuestionBo bo);
/**
* 新增快递问题
*/
Boolean insertByBo(OaExpressQuestionBo bo);
/**
* 修改快递问题
*/
Boolean updateByBo(OaExpressQuestionBo bo);
/**
* 校验并批量删除快递问题信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

57
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaExpressService.java Normal file
View File

@@ -0,0 +1,57 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.OaExpress;
import com.ruoyi.oa.domain.vo.OaExpressVo;
import com.ruoyi.oa.domain.bo.OaExpressBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 物流预览Service接口
*
* @author hdka
* @date 2025-07-20
*/
public interface IOaExpressService {
/**
* 查询物流预览
*/
OaExpressVo queryById(Long expressId);
/**
* 查询物流预览列表
*/
TableDataInfo<OaExpressVo> queryPageList(OaExpressBo bo, PageQuery pageQuery);
/**
* 查询物流预览列表
*/
List<OaExpressVo> queryList(OaExpressBo bo);
/**
* 新增物流预览
*/
Boolean insertByBo(OaExpressBo bo);
/**
* 修改物流预览
*/
Boolean updateByBo(OaExpressBo bo);
/**
* 校验并批量删除物流预览信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 及时更新选中的状态
* @param list
* @return
*/
Boolean getRefreshExpress(List<Long> list);
}

9
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaReportDetailService.java
View File

@@ -6,6 +6,7 @@ import com.ruoyi.oa.domain.bo.OaReportDetailBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import javax.validation.constraints.NotNull;
import java.util.Collection;
import java.util.List;
@@ -46,4 +47,12 @@ public interface IOaReportDetailService {
* 校验并批量删除设计项目汇报详情信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 根据项目查询细节
* @param projectId
* @return
*/
List<OaReportDetailVo> queryByProjectId(@NotNull(message = "主键不能为空") Long projectId);
}

115
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressQuestionServiceImpl.java Normal file
View File

@@ -0,0 +1,115 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.OaExpressQuestionBo;
import com.ruoyi.oa.domain.vo.OaExpressQuestionVo;
import com.ruoyi.oa.domain.OaExpressQuestion;
import com.ruoyi.oa.mapper.OaExpressQuestionMapper;
import com.ruoyi.oa.service.IOaExpressQuestionService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 快递问题Service业务层处理
*
* @author hdka
* @date 2025-07-21
*/
@RequiredArgsConstructor
@Service
public class OaExpressQuestionServiceImpl implements IOaExpressQuestionService {
private final OaExpressQuestionMapper baseMapper;
/**
* 查询快递问题
*/
@Override
public OaExpressQuestionVo queryById(Long questionId){
return baseMapper.selectVoById(questionId);
}
/**
* 查询快递问题列表
*/
@Override
public TableDataInfo<OaExpressQuestionVo> queryPageList(OaExpressQuestionBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
Page<OaExpressQuestionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询快递问题列表
*/
@Override
public List<OaExpressQuestionVo> queryList(OaExpressQuestionBo bo) {
LambdaQueryWrapper<OaExpressQuestion> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaExpressQuestion> buildQueryWrapper(OaExpressQuestionBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaExpressQuestion> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getExpressId() != null, OaExpressQuestion::getExpressId, bo.getExpressId());
lqw.eq(StringUtils.isNotBlank(bo.getDescription()), OaExpressQuestion::getDescription, bo.getDescription());
lqw.eq(bo.getReportTime() != null, OaExpressQuestion::getReportTime, bo.getReportTime());
lqw.eq(StringUtils.isNotBlank(bo.getReportBy()), OaExpressQuestion::getReportBy, bo.getReportBy());
lqw.eq(bo.getStatus() != null, OaExpressQuestion::getStatus, bo.getStatus());
return lqw;
}
/**
* 新增快递问题
*/
@Override
public Boolean insertByBo(OaExpressQuestionBo bo) {
OaExpressQuestion add = BeanUtil.toBean(bo, OaExpressQuestion.class);
validEntityBeforeSave(add);
add.setReportBy(LoginHelper.getNickName());
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setQuestionId(add.getQuestionId());
}
return flag;
}
/**
* 修改快递问题
*/
@Override
public Boolean updateByBo(OaExpressQuestionBo bo) {
OaExpressQuestion update = BeanUtil.toBean(bo, OaExpressQuestion.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaExpressQuestion entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除快递问题
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

150
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaExpressServiceImpl.java Normal file
View File

@@ -0,0 +1,150 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.oa.utils.SfRouteQueryUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.OaExpressBo;
import com.ruoyi.oa.domain.vo.OaExpressVo;
import com.ruoyi.oa.domain.OaExpress;
import com.ruoyi.oa.mapper.OaExpressMapper;
import com.ruoyi.oa.service.IOaExpressService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* 物流预览Service业务层处理
*
* @author hdka
* @date 2025-07-20
*/
@RequiredArgsConstructor
@Service
public class OaExpressServiceImpl implements IOaExpressService {
private final OaExpressMapper baseMapper;
/**
* 查询物流预览
*/
@Override
public OaExpressVo queryById(Long expressId){
return baseMapper.selectVoByIdPlus(expressId);
}
/**
* 查询物流预览列表
*/
@Override
public TableDataInfo<OaExpressVo> queryPageList(OaExpressBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
Page<OaExpressVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询物流预览列表
*/
@Override
public List<OaExpressVo> queryList(OaExpressBo bo) {
LambdaQueryWrapper<OaExpress> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OaExpress> buildQueryWrapper(OaExpressBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaExpress> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getExpressCode()), OaExpress::getExpressCode, bo.getExpressCode());
lqw.eq(bo.getStatus() != null, OaExpress::getStatus, bo.getStatus());
lqw.like(StringUtils.isNotBlank(bo.getSupplyName()), OaExpress::getSupplyName, bo.getSupplyName());
lqw.eq(StringUtils.isNotBlank(bo.getSupplyPhone()), OaExpress::getSupplyPhone, bo.getSupplyPhone());
lqw.eq(bo.getOwnerId() != null, OaExpress::getOwnerId, bo.getOwnerId());
lqw.eq(StringUtils.isNotBlank(bo.getOwnerPhone()), OaExpress::getOwnerPhone, bo.getOwnerPhone());
lqw.eq(bo.getPlanDate() != null, OaExpress::getPlanDate, bo.getPlanDate());
lqw.eq(bo.getProjectId() != null, OaExpress::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getExpressType()), OaExpress::getExpressType, bo.getExpressType());
return lqw;
}
/**
* 新增物流预览
*/
@Override
public Boolean insertByBo(OaExpressBo bo) {
OaExpress add = BeanUtil.toBean(bo, OaExpress.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setExpressId(add.getExpressId());
}
return flag;
}
/**
* 修改物流预览
*/
@Override
public Boolean updateByBo(OaExpressBo bo) {
OaExpress update = BeanUtil.toBean(bo, OaExpress.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OaExpress entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除物流预览
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
* 获取所有需要刷新的快递ID（示例：所有类型为SF且状态为1的快递单）
*/
public List<Long> getAllSfExpressIdsToRefresh() {
LambdaQueryWrapper<OaExpress> lqw = Wrappers.lambdaQuery();
lqw.eq(OaExpress::getExpressType, "SF");
lqw.eq(OaExpress::getStatus, 1L);
List<OaExpress> list = baseMapper.selectList(lqw);
return list.stream().map(OaExpress::getExpressId).collect(Collectors.toList());
}
@Override
public Boolean getRefreshExpress(List<Long> expressIds) {
for (Long expressId : expressIds) {
OaExpressVo oaExpressVo = baseMapper.selectVoById(expressId);
String expressType = oaExpressVo.getExpressType();
if (expressType.equals("SF") && oaExpressVo.getStatus() ==1L) {
// 校验为顺丰则进入此位置更新状态
String result = SfRouteQueryUtil.queryRoute(oaExpressVo.getExpressCode(), oaExpressVo.getOwnerPhone() != null ? oaExpressVo.getOwnerPhone() : oaExpressVo.getSupplyPhone());
OaExpressVo oaExpressVo1 = SfRouteQueryUtil.parseData(result);
if (oaExpressVo1 != null) {
oaExpressVo.setLastUpdateTime(oaExpressVo1.getAcceptTime());
oaExpressVo.setLastStatus(oaExpressVo1.getFirstStatusName());
}
}
OaExpress add = BeanUtil.toBean(oaExpressVo, OaExpress.class);
baseMapper.updateById(add);;
}
return true;
}
}

10
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaReportDetailServiceImpl.java
View File

@@ -15,10 +15,7 @@ import com.ruoyi.oa.domain.OaReportDetail;
import com.ruoyi.oa.mapper.OaReportDetailMapper;
import com.ruoyi.oa.service.IOaReportDetailService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;
/**
* 设计项目汇报详情Service业务层处理
@@ -151,4 +148,9 @@ public class OaReportDetailServiceImpl implements IOaReportDetailService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public List<OaReportDetailVo> queryByProjectId(Long projectId) {
return baseMapper.queryByProjectId(projectId);
}
}