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

bug修改

Browse Source
This commit is contained in:
zengtao01
2024-10-07 10:10:14 +08:00
parent a12121fefb
commit e3aa6e4194
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/admincard/AdminCardMapper.java
View File

@ -1,13 +1,11 @@
package cn.iocoder.yudao.module.member.dal.mysql.admincard;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.member.controller.admin.admincard.vo.AdminCardPageReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.admincard.AdminCardDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.member.controller.admin.admincard.vo.*;
/**
* 管理员卡 Mapper
@ -20,6 +18,7 @@ public interface AdminCardMapper extends BaseMapperX<AdminCardDO> {
default PageResult<AdminCardDO> selectPage(AdminCardPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<AdminCardDO>()
.eqIfPresent(AdminCardDO::getCardNo, reqVO.getCardNo())
.eqIfPresent(AdminCardDO::getCreator,reqVO.getType())
.betweenIfPresent(AdminCardDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(AdminCardDO::getId));
}

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
View File

@ -31,6 +31,8 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -216,6 +218,7 @@ public class DevuceServiceImpl implements DevuceService {
} else {
s = null;
}
maps.forEach(f ->{
String nutritionName = f.get("nutritionName").toString();
f.put("nutritionName",nutritionName.substring(0,nutritionName.length()-7));
@ -224,9 +227,29 @@ public class DevuceServiceImpl implements DevuceService {
f.put("userName",s);
f.put("dishesSumPrice",dishesDO.getDishesSumPrice());
});
if(CollectionUtil.isEmpty(maps)){
List<Map> newMap = new ArrayList<>();
List<String> list = Arrays.asList("能量(/100g)", "脂肪(/100g)", "碳水化合物(/100g)", "蛋白质(/100g)");
for(int i= 0;i<4;i++){
HashMap<Object, Object> map = new HashMap<>();
map.put("dishesName",dishesDO.getDishesName());
map.put("dishesImageUrl",dishesDO.getDishesImageUrl());
map.put("userName",s);
map.put("dishesSumPrice",dishesDO.getDishesSumPrice());
map.put("nutritionName",list.get(i));
map.put("nutritionNumber",100);
map.put("nutritionPer","33.34%");
newMap.add(map);
}
return newMap;
}
return maps;
}
/**
* @return
* @Description: 根据ip获取门店id

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java
View File

@ -96,6 +96,7 @@ public class DishesServiceImpl implements DishesService {
Long carteenId = deviceInfoService.getCarteen(getHearder());
dishes.setCarteenId(carteenId);
dishes.setDishesNumber(new BigDecimal("50"));
//计算每g多少钱
BigDecimal dishesSumPrice = vo.getDishesSumPrice();
BigDecimal dishesNumber = new BigDecimal("50");