dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/nny_1/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2023-10-28 17:12:35 +08:00
commit ec60b58193
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
View File

@ -132,22 +132,27 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
queryWrapper.eq("store_id",storeId);
List<CvsGoods> cvsGoods = baseMapper.selectList(queryWrapper);
List<CvsGoodsTree> list = new ArrayList<>();
List<CvsGoodsVo> goodsVos = new ArrayList<>();
for (CvsGoods cvsGood : cvsGoods) {
if (cvsGood.getPid()==0){
CvsGoodsTree cvsGoodsTree = new CvsGoodsTree();
cvsGoodsTree.setPid(cvsGood.getPid());
CvsGoodsVo cvsGoodsVo = new CvsGoodsVo();
cvsGoodsVo.setPid(cvsGood.getPid());
cvsGoodsTree.setValue(cvsGood.getId());
cvsGoodsTree.setLabel(cvsGood.getName());
cvsGoodsTree.setChildren(new ArrayList<>());
list.add(cvsGoodsTree);
goodsVos.add(cvsGoodsVo);
}
}
for (int i = 0; i < cvsGoods.size(); i++){
List<CvsGoodsTree> children = new ArrayList<>();
for (CvsGoods cvsGood : cvsGoods) {
if (list.get(i).getPid()==cvsGood.getPid()){
if (goodsVos.get(i).getPid()==cvsGood.getPid()){
CvsGoodsTree cvsGoodsTree = new CvsGoodsTree();
cvsGoodsTree.setPid(cvsGood.getPid());
cvsGoodsTree.setValue(cvsGood.getId());
cvsGoodsTree.setLabel(cvsGood.getName());
children.add(cvsGoodsTree);

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/CvsGoodsTree.java
View File

@ -7,7 +7,6 @@ import java.util.List;
@Data
public class CvsGoodsTree {
private Integer value;
private Integer pid;
private String label;
private List<CvsGoodsTree> children;
}