czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突

This commit is contained in:
wangw 2024-06-26 14:32:49 +08:00
parent aa51ff123b
commit b96c4dcef2
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@ -778,17 +778,8 @@ public class OrderService {
skuInfoPos=new ArrayList<>(); skuInfoPos=new ArrayList<>();
} }
orderInfo.setSkuInfos(skuInfoPos); orderInfo.setSkuInfos(skuInfoPos);
orderInfo.setZdNo("POS"); orderInfo.setZdNo("POS");
orderInfo.setNames(orderInfo.getProductName().split(",")); orderInfo.setNames(orderInfo.getProductName().split(","));
List<SkuInfoPo> skuInfoPos=tbOrderInfoMapper.selectSkuByOrderId(orderInfo.getId().toString());
if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){
skuInfoPos=new ArrayList<>();
}
orderInfo.setSkuInfos(skuInfoPos);
} }
PageInfo pageInfo = new PageInfo(list); PageInfo pageInfo = new PageInfo(list);
log.info("获取订单:{}", JSONUtil.toJSONString(pageInfo)); log.info("获取订单:{}", JSONUtil.toJSONString(pageInfo));