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-20 19:14:41 +08:00
parent 1455266a43
commit 19edf755ea
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/OrderDeliveryService.java
View File

@ -13,4 +13,6 @@ public interface OrderDeliveryService {
void deleteByOrderIds(List<Long> orderIds, Collection<LocalDate> orderDates); void deleteByOrderIds(List<Long> orderIds, Collection<LocalDate> orderDates);
void insertList(Collection<OrderDelivery> entityList); void insertList(Collection<OrderDelivery> entityList);
List<OrderDelivery> listOrderDeliveryByOrderIds(List<Long> orderIds, Collection<LocalDate> orderDates);
} }

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

@ -61,4 +61,13 @@ public class OrderDeliveryServiceImpl extends ServiceImpl<OrderDeliveryMapper, O
} }
} }
public List<OrderDelivery> listOrderDeliveryByOrderIds(List<Long> orderIds, Collection<LocalDate> orderDates) {
if (CollUtil.isEmpty(orderIds)) {
return CollUtil.newArrayList(new OrderDelivery[0]);
} else {
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)));
}
}
} }

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/api/TradeRecordApi.java
View File

@ -79,4 +79,16 @@ public class TradeRecordApi {
public List<TradeChannelVO> listChannelDetailByTradeId(Long tradeId) { public List<TradeChannelVO> listChannelDetailByTradeId(Long tradeId) {
return this.tradeChannelService.listChannelDetailByTradeId(tradeId); return this.tradeChannelService.listChannelDetailByTradeId(tradeId);
} }
@Transactional(
rollbackFor = {Exception.class}
)
public void updateOrderRechargeId(Long tradeId, String newMacOrderId, List<Long> 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()));
}
}
} }

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/TradeRecordService.java
View File

@ -28,4 +28,6 @@ public interface TradeRecordService {
void insertTradeRecord(TradeRecord tradeRecord); void insertTradeRecord(TradeRecord tradeRecord);
void insertOrderRechargeTrade(List<TradeOrderRecharge> tradeOrderRechargeList); void insertOrderRechargeTrade(List<TradeOrderRecharge> tradeOrderRechargeList);
void deleteOrderRechargeTrade(Long tradeId);
} }

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/pay/common/service/impl/TradeRecordServiceImpl.java
View File

@ -119,4 +119,9 @@ public class TradeRecordServiceImpl extends ServiceImpl<TradeRecordMapper, Trade
this.updateTradeRecordState(tradeId, refundVO.getCode(), refundVO.getMsg(), refundVO.getOutTradeNo() this.updateTradeRecordState(tradeId, refundVO.getCode(), refundVO.getMsg(), refundVO.getOutTradeNo()
, null, null, null, null); , null, null, null, null);
} }
public void deleteOrderRechargeTrade(Long tradeId) {
this.tradeOrderRechargeMapper.delete((Wrapper)Wrappers.lambdaQuery(TradeOrderRecharge.class).eq(TradeOrderRecharge::getTradeId, tradeId));
}
} }