From 55c21ea4fcef498d78cb4a99fcc9ddae6759443f Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Fri, 21 Feb 2025 10:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderInfoServiceImpl.java    | 52 ++++++++++++-------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java
index c3cc0332..1f3328c8 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java
@@ -184,20 +184,19 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
               .eq(OrderInfo::getCustId, custId).ge(OrderInfo::getOrderDate, nowDate)
               .eq(OrderInfo::getOrderState, OrderStateEnum.PLACE.getKey()));
    }
-//
-//   public void initOrderCustInfo(List<OrderInfo> orderInfoList, Long custId) {
-//      if (!CollUtil.isEmpty(orderInfoList)) {
-//         if (orderInfoList.stream().anyMatch((s) -> {
-//            return !s.hasCustInfo(custId);
-//         })) {
-//            CustPayVO custInfo = this.orderModuleClient.custPayInfoQuery(CustPayInfoQueryParam.ofCustId(LeNumUtil.idOrDefault(custId)));
-//            orderInfoList.forEach((s) -> {
-//               s.fillCustInfo(custInfo);
-//            });
-//         }
-//
-//      }
-//   }
+
+   public void initOrderCustInfo(List<OrderInfo> orderInfoList, Long custId) {
+      if (!CollUtil.isEmpty(orderInfoList)) {
+         if (orderInfoList.stream().anyMatch((s) -> {
+            return !s.hasCustInfo(custId);
+         })) {
+            CustPayVO custInfo = this.orderModuleClient.custPayInfoQuery(CustPayInfoQueryParam.ofCustId(LeNumUtil.idOrDefault(custId)));
+            orderInfoList.forEach((s) -> {
+               s.fillCustInfo(custInfo);
+            });
+         }
+      }
+   }
 //
 //   public <T extends OrderInfoWithCustName> void fillOrderCustName(List<T> orderInfoList, boolean skipIfNameExists) {
 //      if (!CollUtil.isEmpty(orderInfoList)) {
@@ -411,11 +410,26 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 //   public long existReserveOrderUnPrint(Long canteenId, Long stallId, Integer mealtimeType) {
 //      return this.count((Wrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderInfo.class).eq(ObjectUtil.isNotNull(canteenId), OrderInfo::getCanteenId, canteenId)).eq(ObjectUtil.isNotNull(stallId), OrderInfo::getStallId, stallId)).eq(ObjectUtil.isNotNull(mealtimeType), OrderInfo::getMealtimeType, mealtimeType)).between(OrderInfo::getOrderDate, LocalDate.now(), LeOrderUtil.queryDateRange().get(1))).eq(OrderInfo::getOrderType, OrderTypeEnum.RESERVE_MEAL.getKey())).eq(OrderInfo::getOrderState, OrderStateEnum.PLACE.getKey()));
 //   }
-//
-//   public String getMaxMealCodeOfDate(LocalDate orderDate, Integer mealtimeType, Long canteenId, Long stallId) {
-//      OrderInfo orderInfo = (OrderInfo)((OrderInfoMapper)this.baseMapper).selectOne((Wrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderInfo.class).select(new SFunction[]{OrderInfo::getMealCode}).eq(OrderInfo::getOrderDate, orderDate)).eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG)).eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG)).eq(LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, mealtimeType)).in(!LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, AllocMealtimeTypeEnum.allTypeList())).in(OrderInfo::getOrderType, OrderTypeEnum.allTypeList())).orderByDesc(OrderInfo::getOrderId)).last("limit 1"));
-//      return orderInfo != null ? orderInfo.getMealCode() : null;
-//   }
+
+   public String getMaxMealCodeOfDate(LocalDate orderDate, Integer mealtimeType, Long canteenId, Long stallId) {
+      //OrderInfo orderInfo = (OrderInfo)((OrderInfoMapper)this.baseMapper).selectOne((Wrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderInfo.class)
+      // .select(new SFunction[]{OrderInfo::getMealCode})
+      // .eq(OrderInfo::getOrderDate, orderDate))
+      // .eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG))
+      // .eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG))
+      // .eq(LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, mealtimeType))
+      // .in(!LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, AllocMealtimeTypeEnum.allTypeList()))
+      // .in(OrderInfo::getOrderType, OrderTypeEnum.allTypeList())).orderByDesc(OrderInfo::getOrderId)).last("limit 1"));
+      OrderInfo orderInfo = (OrderInfo)((OrderInfoMapper)this.baseMapper).selectOne(Wrappers.lambdaQuery(OrderInfo.class)
+              .select(OrderInfo::getMealCode)
+              .eq(OrderInfo::getOrderDate, orderDate)
+              .eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG)
+              .eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG)
+              .eq(LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, mealtimeType)
+              .in(!LeNumUtil.isValidId(mealtimeType), OrderInfo::getMealtimeType, AllocMealtimeTypeEnum.allTypeList())
+              .in(OrderInfo::getOrderType, OrderTypeEnum.allTypeList()).orderByDesc(OrderInfo::getOrderId).last("limit 1"));
+      return orderInfo != null ? orderInfo.getMealCode() : null;
+   }
 
    protected LambdaQueryWrapper<OrderInfo> getOrderSelectWrappers() {
       return Wrappers.lambdaQuery(OrderInfo.class).select(OrderInfo::getOrderId, OrderInfo::getCustId, OrderInfo::getSourceType, OrderInfo::getCanteenId, OrderInfo::getStallId, OrderInfo::getMealtimeType, OrderInfo::getCanteenName, OrderInfo::getStallName, OrderInfo::getMealtimeName, OrderInfo::getOrderDate, OrderInfo::getCouponId, OrderInfo::getPayableAmount, OrderInfo::getRealAmount, OrderInfo::getAccPayAmount, OrderInfo::getOutPayAmount, OrderInfo::getOrderTime, OrderInfo::getOrderType, OrderInfo::getOrderState, OrderInfo::getPayTime, OrderInfo::getPayType, OrderInfo::getPayState, OrderInfo::getDeliveryType, OrderInfo::getDishesState, OrderInfo::getOrderRefundState);