From 3eaf6f0fc570c34b84c1981db711c75be7069b7f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 05 九月 2023 09:29:57 +0800
Subject: [PATCH] 修改商家下单商品id为空
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
index cde44a3..fb0f90a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -115,30 +115,34 @@
}
@Override
- public R detailWorkGuide(Long workGuideId, Long communityId) {
+ public R detailWorkGuide(String workGuideId, String communityId) {
ComActWorkGuideDO workGuideDO = this.baseMapper.selectById(workGuideId);
if (workGuideDO == null) {
return R.fail("Id有误！");
}
ComActWorkGuideVO vo = new ComActWorkGuideVO();
BeanUtils.copyProperties(workGuideDO, vo);
- ComActDO comActDO = comActDAO.selectById(communityId);
- if (comActDO != null) {
- vo.setAddress(comActDO.getAddress());
- vo.setPhone(comActDO.getContactsPhone());
- vo.setLon(comActDO.getLng());
- vo.setLat(comActDO.getLat());
- }
- List<ComActWorkGuideMaterialDO> workGuideMaterialDOS =
- workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
- .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
- workGuideMaterialDOS.forEach(workGuideMaterialDO -> {
- ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO();
- workGuideMaterialVO.setId(workGuideMaterialDO.getId());
- workGuideMaterialVO.setMaterialName(workGuideMaterialDO.getMaterialName());
- vo.getMaterials().add(workGuideMaterialVO);
- });
+ if(!StringUtils.isEmpty(communityId))
+ {
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ if (comActDO != null) {
+ vo.setAddress(comActDO.getAddress());
+ vo.setPhone(comActDO.getContactsPhone());
+ vo.setLon(comActDO.getLng());
+ vo.setLat(comActDO.getLat());
+ }
+
+ List<ComActWorkGuideMaterialDO> workGuideMaterialDOS =
+ workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
+ .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
+ workGuideMaterialDOS.forEach(workGuideMaterialDO -> {
+ ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO();
+ workGuideMaterialVO.setId(workGuideMaterialDO.getId());
+ workGuideMaterialVO.setMaterialName(workGuideMaterialDO.getMaterialName());
+ vo.getMaterials().add(workGuideMaterialVO);
+ });
+ }
return R.ok(vo);
}
@@ -159,7 +163,9 @@
if (!iPage.getRecords().isEmpty()) {
iPage.getRecords().forEach(comActWorkGuideVO -> {
ComActWorkGuideClassifyDO comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(comActWorkGuideVO.getClassify());
- comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
+ if (comActWorkGuideClassifyDO != null) {
+ comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
+ }
});
}
return R.ok(iPage);
@@ -183,7 +189,7 @@
//结果数据集合
List<ComActWorkGuideAppletsVO> resultList = new ArrayList<>();
- List<ComActWorkGuideAppletsVO> workGuideClassifyList = comActWorkGuideClassifyDAO.listWorkGuideClassify();
+ List<ComActWorkGuideAppletsVO> workGuideClassifyList = comActWorkGuideClassifyDAO.listWorkGuideClassify(pageActWorkGuideDTO.getAreaCode());
//通过办事指南分类查询分类下办事指南
workGuideClassifyList.forEach(workGuideClassify -> {
List<ComActWorkGuideDetailAppletsVO> workGuideList = this.baseMapper.getWorkGuideListByClassifyId(workGuideClassify.getId(),10L);
--
Gitblit v1.7.1