zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/分账重构'

Browse Source
This commit is contained in:
seesaw
2024-08-19 16:32:49 +08:00
parent dfbf13a76f 5e7ecfa56d
commit d21e0d87e0
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.service.order;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@ -165,10 +166,12 @@ public class OrderServiceImpl implements OrderService {
appOrderDetailRespVOS.forEach(respVo -> {
DishesRespDto dishesRespDto = dishMap.get(respVo.getDishesId());
if(ObjectUtil.isNotEmpty(dishesRespDto)){
respVo.setDishesBasePrice(dishesRespDto.getDishesBasePrice())
.setDishesSumPrice(dishesRespDto.getDishesSumPrice())
.setDishesNumber(dishesRespDto.getDishesNumber());
}
respVo.setDishesBasePrice(dishesRespDto.getDishesBasePrice())
.setDishesSumPrice(dishesRespDto.getDishesSumPrice())
.setDishesNumber(dishesRespDto.getDishesNumber());
});
dishOrderDO.setRefundStatus(refundService.getRefundStatus(dishOrderDO.getId()));
}

7
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
View File

@ -576,7 +576,12 @@ public class MemberUserServiceImpl implements MemberUserService {
.collect(Collectors.toList());
//获取菜品营养信息
List<DishesNutritionRespDTO> dishesList=new ArrayList<>();
collect1.forEach(x-> dishesList.addAll(dishesNutritionApil.getDishesList(x)));
collect1.forEach(x-> {
List<DishesNutritionRespDTO> dishesList1 = dishesNutritionApil.getDishesList(x);
if ( CollectionUtil.isNotEmpty(dishesList1)){
dishesList.addAll(dishesList1);
}
});
//根据营养名称进行分组
if(ObjUtil.isNotEmpty(dishesList)){
BigDecimal reduce = value1.stream()