diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/api/AccTradeApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/api/AccTradeApi.java index eaf67661..9cc508ef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/api/AccTradeApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/api/AccTradeApi.java @@ -39,7 +39,9 @@ public class AccTradeApi { } public Map listOrderAccPayDetail(List leOrdNos) { - //List accTradeList = this.accTradeService.list((Wrapper) Wrappers.lambdaQuery(AccTrade.class).select(new SFunction[]{AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal}).in(AccTrade::getLeOrdNo, leOrdNos)); + //List accTradeList = this.accTradeService.list((Wrapper) Wrappers.lambdaQuery(AccTrade.class) + // .select(new SFunction[]{AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal}) + // .in(AccTrade::getLeOrdNo, leOrdNos)); List accTradeList = this.accTradeService.list(Wrappers.lambdaQuery(AccTrade.class) .select(AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal) .in(AccTrade::getLeOrdNo, leOrdNos)); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderDeliveryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderDeliveryServiceImpl.java index 63cdcd64..ec9c2804 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderDeliveryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderDeliveryServiceImpl.java @@ -67,7 +67,9 @@ public class OrderDeliveryServiceImpl extends ServiceImpl dateRange = LeOrderUtil.queryDateRange((Collection)orderIds, (Collection)orderDates); - //return ((OrderDeliveryMapper)this.baseMapper).selectList((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderDelivery.class).in(OrderDelivery::getOrderId, orderIds)).between(OrderDelivery::getOrderDate, dateRange.get(0), dateRange.get(1))); + //return ((OrderDeliveryMapper)this.baseMapper).selectList((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(OrderDelivery.class) + // .in(OrderDelivery::getOrderId, orderIds)) + // .between(OrderDelivery::getOrderDate, dateRange.get(0), dateRange.get(1))); List result = ((OrderDeliveryMapper)this.baseMapper).selectList(Wrappers.lambdaQuery(OrderDelivery.class) .in(OrderDelivery::getOrderId, orderIds) .between(OrderDelivery::getOrderDate, dateRange.get(0), dateRange.get(1))); 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 46fd0f13..ee59910d 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 @@ -400,9 +400,16 @@ public class OrderInfoServiceImpl extends ServiceImpl