bonus
/
Bonus-Cloud-Smart-Canteen
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync_pay_state

This commit is contained in:
sxu 2025-02-21 08:55:59 +08:00
parent 5c59fac94a
commit 01367d91d5
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/api/AccTradeApi.java
View File

@ -39,7 +39,9 @@ public class AccTradeApi {
} }
public Map<Long, AccTradeOrderBalanceVO> listOrderAccPayDetail(List<Long> leOrdNos) { public Map<Long, AccTradeOrderBalanceVO> listOrderAccPayDetail(List<Long> leOrdNos) {
//List<AccTrade> accTradeList = this.accTradeService.list((Wrapper) Wrappers.lambdaQuery(AccTrade.class).select(new SFunction[]{AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal}).in(AccTrade::getLeOrdNo, leOrdNos)); //List<AccTrade> accTradeList = this.accTradeService.list((Wrapper) Wrappers.lambdaQuery(AccTrade.class)
// .select(new SFunction[]{AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal})
// .in(AccTrade::getLeOrdNo, leOrdNos));
List<AccTrade> accTradeList = this.accTradeService.list(Wrappers.lambdaQuery(AccTrade.class) List<AccTrade> accTradeList = this.accTradeService.list(Wrappers.lambdaQuery(AccTrade.class)
.select(AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal) .select(AccTrade::getId, AccTrade::getLeOrdNo, AccTrade::getWalletBalTotal)
.in(AccTrade::getLeOrdNo, leOrdNos)); .in(AccTrade::getLeOrdNo, leOrdNos));

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderDeliveryServiceImpl.java
View File

@ -67,7 +67,9 @@ public class OrderDeliveryServiceImpl extends ServiceImpl<OrderDeliveryMapper, O
return CollUtil.newArrayList(new OrderDelivery[0]); return CollUtil.newArrayList(new OrderDelivery[0]);
} else { } else {
List<LocalDate> dateRange = LeOrderUtil.queryDateRange((Collection)orderIds, (Collection)orderDates); List<LocalDate> 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<OrderDelivery> result = ((OrderDeliveryMapper)this.baseMapper).selectList(Wrappers.lambdaQuery(OrderDelivery.class) List<OrderDelivery> result = ((OrderDeliveryMapper)this.baseMapper).selectList(Wrappers.lambdaQuery(OrderDelivery.class)
.in(OrderDelivery::getOrderId, orderIds) .in(OrderDelivery::getOrderId, orderIds)
.between(OrderDelivery::getOrderDate, dateRange.get(0), dateRange.get(1))); .between(OrderDelivery::getOrderDate, dateRange.get(0), dateRange.get(1)));

11
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java
View File

@ -400,9 +400,16 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
// } // }
public String getMaxMealCodeOfDate(LocalDate orderDate, Integer mealtimeType, Long canteenId, Long stallId) { 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((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) OrderInfo orderInfo = (OrderInfo)((OrderInfoMapper)this.baseMapper).selectOne(Wrappers.lambdaQuery(OrderInfo.class)
.select(OrderInfo::getMealCode) .select(OrderInfo::getMealCode)
.eq(OrderInfo::getOrderDate, orderDate) .eq(OrderInfo::getOrderDate, orderDate)
.eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG) .eq(OrderInfo::getCanteenId, LeNumUtil.isValidId(canteenId) ? canteenId : LeConstants.DATA_DEFAULT_LONG)
.eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG) .eq(OrderInfo::getStallId, LeNumUtil.isValidId(stallId) ? stallId : LeConstants.DATA_DEFAULT_LONG)