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

订单明细添加设备ip

Browse Source
This commit is contained in:
qjq
2024-04-11 18:03:29 +08:00
parent 444dbdae64
commit fcbd657178
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/orderdetail/OrderDetailDO.java
View File

@ -58,5 +58,8 @@ public class OrderDetailDO extends BaseDO {
* 菜品图片 * 菜品图片
*/ */
private String dishUrl; private String dishUrl;
/**
* 设备ip
*/
private String sn;
} }

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

@ -105,7 +105,7 @@ public class OrderServiceImpl implements OrderService {
AppOrderRespVO appOrderRespVO = BeanUtils.toBean(order, AppOrderRespVO.class); AppOrderRespVO appOrderRespVO = BeanUtils.toBean(order, AppOrderRespVO.class);
List<AppOrderDetailRespVO> appOrderDetailRespVOS = orderDetailService.selectListByOrderId(id); List<AppOrderDetailRespVO> appOrderDetailRespVOS = orderDetailService.selectListByOrderId(id);
appOrderRespVO.setDetailList(appOrderDetailRespVOS); appOrderRespVO.setDetailList(appOrderDetailRespVOS);
Double reduce = appOrderDetailRespVOS.stream().map(AppOrderDetailRespVO::getHeat).reduce(0d, Double::sum); Double reduce = appOrderDetailRespVOS.stream().map(AppOrderDetailRespVO::getHeat).filter(heat -> ObjUtil.isNotEmpty(heat)).reduce(0d, Double::sum);
appOrderRespVO.setIntake(reduce); appOrderRespVO.setIntake(reduce);
//判断时间 //判断时间
int hour = order.getCreateTime().getHour(); int hour = order.getCreateTime().getHour();
@ -127,7 +127,7 @@ public class OrderServiceImpl implements OrderService {
@Override @Override
public PageResult<AppOrderRespVO> getOrderList(AppPageVo vo) { public PageResult<AppOrderRespVO> getOrderList(AppPageVo vo) {
PageResult<DishOrderDO> dishOrderDOPageResult = dishOrderMapper.selectPage(vo, Wrappers.<DishOrderDO>lambdaQuery().eq(DishOrderDO::getUserId, vo.getUserId())); PageResult<DishOrderDO> dishOrderDOPageResult = dishOrderMapper.selectPage(vo, Wrappers.<DishOrderDO>lambdaQuery().eq(DishOrderDO::getUserId, vo.getUserId()).orderByDesc(DishOrderDO::getCreateTime));
PageResult<AppOrderRespVO> appOrderRespVOPageResult = BeanUtils.toBean(dishOrderDOPageResult, AppOrderRespVO.class); PageResult<AppOrderRespVO> appOrderRespVOPageResult = BeanUtils.toBean(dishOrderDOPageResult, AppOrderRespVO.class);
for (AppOrderRespVO dishOrderDO : appOrderRespVOPageResult.getList()){ for (AppOrderRespVO dishOrderDO : appOrderRespVOPageResult.getList()){
List<AppOrderDetailRespVO> appOrderDetailRespVOS = orderDetailService.selectListByOrderId(dishOrderDO.getId()); List<AppOrderDetailRespVO> appOrderDetailRespVOS = orderDetailService.selectListByOrderId(dishOrderDO.getId());

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

@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.util.List; import java.util.List;
@ -62,6 +63,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
@Resource @Resource
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;
@Resource
private HttpServletRequest httpServletRequest;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Long createOrderDetail(AppOrderDetailSaveReqVO createReqVO) { public Long createOrderDetail(AppOrderDetailSaveReqVO createReqVO) {
@ -110,6 +115,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
} }
orderDetail.setOrderId(dishOrderDO.getId()).setDishesName(dish.getDishesName()).setDishUrl(dish.getDishesImageUrl()); orderDetail.setOrderId(dishOrderDO.getId()).setDishesName(dish.getDishesName()).setDishUrl(dish.getDishesImageUrl());
orderDetail.setSn(this.getHearder());
orderDetailMapper.insert(orderDetail); orderDetailMapper.insert(orderDetail);
// 返回 // 返回
return orderDetail.getId(); return orderDetail.getId();
@ -159,4 +165,11 @@ public class OrderDetailServiceImpl implements OrderDetailService {
List<OrderDetailDO> orderDetailDOS = orderDetailMapper.selectList(Wrappers.<OrderDetailDO>lambdaQuery().in(OrderDetailDO::getOrderId, orderIds)); List<OrderDetailDO> orderDetailDOS = orderDetailMapper.selectList(Wrappers.<OrderDetailDO>lambdaQuery().in(OrderDetailDO::getOrderId, orderIds));
return orderDetailDOS; return orderDetailDOS;
} }
public String getHearder(){
try {
return httpServletRequest.getHeader("Authorization");
} catch (Exception e) {
throw exception(2000_10_001,"无法获取设备编码");
}
}
} }