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

设备订单状态下单后改为已完成（需求来自shengxu）

This commit is contained in:
gaowdong 2025-06-12 10:39:37 +08:00
parent 20dd2005d3
commit 7ade0be51f
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java
View File

@ -150,14 +150,33 @@ public class OrderBusiness {
log.error("订单支付异常", ex);
throw new ServiceException("支付失败");
}
List<OrderInfo> deviceOrderInfoList = orderInfoList.stream()
.filter(orderInfo -> StringUtils.isNotEmpty(orderInfo.getDeviceOrderId()))
.collect(Collectors.toList());
List<OrderInfo> reserveOrderInfoList = orderInfoList.stream()
.filter(orderInfo -> StringUtils.isEmpty(orderInfo.getDeviceOrderId()))
.collect(Collectors.toList());
if(CollUtil.isNotEmpty(deviceOrderInfoList)) {
OrderPayResultDTO orderPayResultDTO = new OrderPayResultDTO();
orderPayResultDTO.setOrderIdList(orderInfoList.stream().map(OrderInfo::getOrderId).collect(Collectors.toList()));
orderPayResultDTO.setOrderIdList(deviceOrderInfoList.stream().map(OrderInfo::getOrderId).collect(Collectors.toList()));
orderPayResultDTO.setPayState(PayStateEnum.PAY_SUCC.getKey());
orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername());
orderPayResultDTO.setOrderState(OrderStateEnum.FINISH.getKey());
orderPayResultDTO.setPayTime(LocalDateTime.now());
orderPayResultDTO.setUpdateTime(LocalDateTime.now());
orderInfoMapper.updateOrderPayResult(orderPayResultDTO);
}
if(CollUtil.isNotEmpty(reserveOrderInfoList)) {
OrderPayResultDTO orderPayResultDTO = new OrderPayResultDTO();
orderPayResultDTO.setOrderIdList(reserveOrderInfoList.stream().map(OrderInfo::getOrderId).collect(Collectors.toList()));
orderPayResultDTO.setPayState(PayStateEnum.PAY_SUCC.getKey());
orderPayResultDTO.setUpdateBy(SecurityUtils.getUsername());
orderPayResultDTO.setOrderState(OrderStateEnum.PLACE.getKey());
orderPayResultDTO.setPayTime(LocalDateTime.now());
orderPayResultDTO.setUpdateTime(LocalDateTime.now());
orderInfoMapper.updateOrderPayResult(orderPayResultDTO);
}
try {
DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(orderInfoList.get(0).getUserId()),"update");
String jsonString = JacksonUtil.writeValueAsString(bean);