diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/OrderDeliveryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/OrderDeliveryService.java index 1b5eee0e..020bef14 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/OrderDeliveryService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/OrderDeliveryService.java @@ -13,4 +13,6 @@ public interface OrderDeliveryService { void deleteByOrderIds(List orderIds, Collection orderDates); void insertList(Collection entityList); + + List listOrderDeliveryByOrderIds(List orderIds, Collection orderDates); } 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 e81a618e..70f9f438 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 @@ -61,4 +61,13 @@ public class OrderDeliveryServiceImpl extends ServiceImpl listOrderDeliveryByOrderIds(List orderIds, Collection orderDates) { + if (CollUtil.isEmpty(orderIds)) { + return CollUtil.newArrayList(new OrderDelivery[0]); + } else { + List 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))); + } + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/api/TradeRecordApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/api/TradeRecordApi.java index 8a2160ba..15d228ef 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/api/TradeRecordApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/api/TradeRecordApi.java @@ -79,4 +79,16 @@ public class TradeRecordApi { public List listChannelDetailByTradeId(Long tradeId) { return this.tradeChannelService.listChannelDetailByTradeId(tradeId); } + + @Transactional( + rollbackFor = {Exception.class} + ) + public void updateOrderRechargeId(Long tradeId, String newMacOrderId, List newOrderRechargeIds) { + if (!CollUtil.isEmpty(newOrderRechargeIds)) { + this.tradeRecordService.deleteOrderRechargeTrade(tradeId); + this.tradeRecordService.insertOrderRechargeTrade(newOrderRechargeIds.stream().map((s) -> { + return new TradeOrderRecharge(tradeId, s, newMacOrderId, (LocalDateTime)null, (LocalDateTime)null); + }).collect(Collectors.toList())); + } + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/TradeRecordService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/TradeRecordService.java index 0e165c4e..2a327202 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/TradeRecordService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/TradeRecordService.java @@ -28,4 +28,6 @@ public interface TradeRecordService { void insertTradeRecord(TradeRecord tradeRecord); void insertOrderRechargeTrade(List tradeOrderRechargeList); + + void deleteOrderRechargeTrade(Long tradeId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/impl/TradeRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/impl/TradeRecordServiceImpl.java index 71bb5fa7..dc97613e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/impl/TradeRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/impl/TradeRecordServiceImpl.java @@ -119,4 +119,9 @@ public class TradeRecordServiceImpl extends ServiceImpl