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

优化

Browse Source
This commit is contained in:
zengtao01
2024-10-10 15:58:05 +08:00
parent 704010bad6
commit 8ba92347a5
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesService.java
View File

@ -49,6 +49,8 @@ public interface DiningPlatesService {
*/ */
DiningPlatesDO getDiningPlates(Long id); DiningPlatesDO getDiningPlates(Long id);
DiningPlatesDO getDiningPlatesByNum(String diningPlatesNum,Long storeId);
/** /**
* 获得餐盘分页 * 获得餐盘分页
* *

12
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/diningplates/DiningPlatesServiceImpl.java
View File

@ -118,6 +118,18 @@ public class DiningPlatesServiceImpl implements DiningPlatesService {
return diningPlatesMapper.selectById(id); return diningPlatesMapper.selectById(id);
} }
@Override
public DiningPlatesDO getDiningPlatesByNum(String diningPlatesNum,Long storeId) {
LambdaQueryWrapper<DiningPlatesDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DiningPlatesDO::getDiningPlatesNum, diningPlatesNum)
.eq(DiningPlatesDO::getStoreId, storeId);
List<DiningPlatesDO> list = diningPlatesMapper.selectList(wrapper);
if(CollectionUtil.isNotEmpty(list)){
return list.get(0);
}
return new DiningPlatesDO();
}
@Override @Override
public PageResult<DiningPlatesDO> getDiningPlatesPage(DiningPlatesPageReqVO pageReqVO) { public PageResult<DiningPlatesDO> getDiningPlatesPage(DiningPlatesPageReqVO pageReqVO) {
PageResult<DiningPlatesDO> diningPlatesDOPageResult = diningPlatesMapper.selectPage(pageReqVO); PageResult<DiningPlatesDO> diningPlatesDOPageResult = diningPlatesMapper.selectPage(pageReqVO);

23
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
View File

@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.member.controller.admin.screen.vo.DishVO;
import cn.iocoder.yudao.module.member.controller.app.orderdetail.vo.AppOrderDetailPageReqVO; import cn.iocoder.yudao.module.member.controller.app.orderdetail.vo.AppOrderDetailPageReqVO;
import cn.iocoder.yudao.module.member.controller.app.orderdetail.vo.AppOrderDetailRespVO; import cn.iocoder.yudao.module.member.controller.app.orderdetail.vo.AppOrderDetailRespVO;
import cn.iocoder.yudao.module.member.controller.app.orderdetail.vo.AppOrderDetailSaveReqVO; import cn.iocoder.yudao.module.member.controller.app.orderdetail.vo.AppOrderDetailSaveReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.order.DishOrderDO; import cn.iocoder.yudao.module.member.dal.dataobject.diningplates.DiningPlatesDO;
import cn.iocoder.yudao.module.member.dal.dataobject.orderdetail.OrderDetailDO; import cn.iocoder.yudao.module.member.dal.dataobject.orderdetail.OrderDetailDO;
import cn.iocoder.yudao.module.member.dal.mysql.order.DishOrderMapper; import cn.iocoder.yudao.module.member.dal.mysql.order.DishOrderMapper;
import cn.iocoder.yudao.module.member.dal.mysql.orderdetail.OrderDetailMapper; import cn.iocoder.yudao.module.member.dal.mysql.orderdetail.OrderDetailMapper;
@ -33,7 +33,8 @@ import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ORDER_ALREADY_COMPLETE;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ORDER_DETAIL_NOT_EXISTS;
/** /**
* 订单明细 Service 实现类 * 订单明细 Service 实现类
@ -73,23 +74,11 @@ public class OrderDetailServiceImpl implements OrderDetailService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Long createOrderDetail(AppOrderDetailSaveReqVO createReqVO) { public Long createOrderDetail(AppOrderDetailSaveReqVO createReqVO) {
//餐盘号去获取订单 DiningPlatesDO diningPlatesDO = diningPlatesService.getDiningPlatesByNum(createReqVO.getDiningPlatesNum(), createReqVO.getStoreId());
DishOrderDO dishOrderDO = dishOrderMapper.selectOne(Wrappers.<DishOrderDO>lambdaQuery() if (diningPlatesDO == null || diningPlatesDO.getOrderId() ==null) {
.eq(DishOrderDO::getDiningPlatesNum, createReqVO.getDiningPlatesNum())
.eq(DishOrderDO::getStoreId, createReqVO.getStoreId())
.eq(DishOrderDO::getOrderStatus, DishOrderDO.INCOMPLETE)
.orderByDesc(DishOrderDO::getCreateTime)
.last(MemberConstants.LIMIT_ONE));
if (dishOrderDO == null) {
throw exception(ORDER_ALREADY_COMPLETE); throw exception(ORDER_ALREADY_COMPLETE);
} }
////判定餐盘是否绑定并刷新绑定时间
//Boolean b = diningPlatesService.checkBind(createReqVO.getDiningPlatesNum(), createReqVO.getStoreId());
//if (!b) {
// throw exception(DINING_PLATES_NOT_BIND);
//}
DishesRespDto dish = dishesApi.getDish(createReqVO.getDishesId()); DishesRespDto dish = dishesApi.getDish(createReqVO.getDishesId());
DishesNutritionRespDTO dishEnergy = dishesNutritionApi.getDishEnergy(createReqVO.getDishesId()); DishesNutritionRespDTO dishEnergy = dishesNutritionApi.getDishEnergy(createReqVO.getDishesId());
@ -115,7 +104,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
} }
} }
orderDetail.setOrderId(dishOrderDO.getId()).setDishesName(dish.getDishesName()).setDishUrl(dish.getDishesImageUrl()); orderDetail.setOrderId(diningPlatesDO.getOrderId()).setDishesName(dish.getDishesName()).setDishUrl(dish.getDishesImageUrl());
orderDetail.setSn(this.getHearder()); orderDetail.setSn(this.getHearder());
orderDetail.setPrice(bigDecimal1); orderDetail.setPrice(bigDecimal1);
orderDetailMapper.insert(orderDetail); orderDetailMapper.insert(orderDetail);