From fcbd657178c2cb4d51eca0c5f04d147ebac64ae7 Mon Sep 17 00:00:00 2001
From: qjq <1766193529@qq.com>
Date: Thu, 11 Apr 2024 18:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/orderdetail/OrderDetailDO.java   |  5 ++++-
 .../member/service/order/OrderServiceImpl.java      |  4 ++--
 .../service/orderdetail/OrderDetailServiceImpl.java | 13 +++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/orderdetail/OrderDetailDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/orderdetail/OrderDetailDO.java
index 45d53d5c..b5077219 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/orderdetail/OrderDetailDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/orderdetail/OrderDetailDO.java
@@ -58,5 +58,8 @@ public class OrderDetailDO extends BaseDO {
      * 菜品图片
      */
     private String dishUrl;
-
+    /**
+     * 设备ip
+     */
+    private String sn;
 }
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java
index d7b440d9..0aeb158e 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java
@@ -105,7 +105,7 @@ public class OrderServiceImpl implements OrderService {
         AppOrderRespVO appOrderRespVO = BeanUtils.toBean(order, AppOrderRespVO.class);
         List<AppOrderDetailRespVO> appOrderDetailRespVOS = orderDetailService.selectListByOrderId(id);
         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);
         //判断时间
         int hour = order.getCreateTime().getHour();
@@ -127,7 +127,7 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     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);
         for (AppOrderRespVO dishOrderDO : appOrderRespVOPageResult.getList()){
             List<AppOrderDetailRespVO> appOrderDetailRespVOS = orderDetailService.selectListByOrderId(dishOrderDO.getId());
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
index 66a9aa2b..c590624e 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
@@ -62,6 +63,10 @@ public class OrderDetailServiceImpl implements OrderDetailService {
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
+    @Resource
+    private HttpServletRequest httpServletRequest;
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     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.setSn(this.getHearder());
         orderDetailMapper.insert(orderDetail);
         // 返回
         return orderDetail.getId();
@@ -159,4 +165,11 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         List<OrderDetailDO> orderDetailDOS = orderDetailMapper.selectList(Wrappers.<OrderDetailDO>lambdaQuery().in(OrderDetailDO::getOrderId, orderIds));
         return orderDetailDOS;
     }
+    public String getHearder(){
+        try {
+            return httpServletRequest.getHeader("Authorization");
+        } catch (Exception e) {
+            throw exception(2000_10_001,"无法获取设备编码");
+        }
+    }
 }
\ No newline at end of file