suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust

Browse Source
This commit is contained in:
苏竹红
2024-10-11 21:13:22 +08:00
parent 1d438ebba6 f54670cac0
commit e5fe3f2a2c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java
View File

@@ -32,7 +32,7 @@ public class DecorationDesignInfoDAO {
return new ArrayList<>();
}
Example example = new Example(DecorationDesignInfoDO.class);
example.createCriteria().andIn("shopIds", shopIds);
example.createCriteria().andIn("shopId", shopIds);
return decorationDesignInfoMapper.selectByExample(example);
}

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -481,7 +481,8 @@ public class DeskServiceImpl implements DeskService {
List<DecorationDesignInfoDO> decorationDesignInfos = decorationDesignInfoDAO.getByIds(shopIds);
doThing(deskStageMap, subStageList);
for (DecorationDesignInfoDO decorationDesignInfoDO : decorationDesignInfos) {
List<DeskStageDTO> deskStages = deskStageMap.get(decorationDesignInfoDO.getShopId());
List<DeskStageDTO> deskStages = new ArrayList<>();
deskStages.addAll(deskStageMap.get(decorationDesignInfoDO.getShopId()));
if (CollectionUtils.isEmpty(deskStages)) {
DeskStageDTO dto = new DeskStageDTO();
dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, decorationDesignInfoDO.getCreateTime()));