From 7ade0be51f23dd99dd08f5c5a2a613af6ee2fa55 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 12 Jun 2025 10:39:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8B=E5=8D=95=E5=90=8E=E6=94=B9=E4=B8=BA=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=88=E9=9C=80=E6=B1=82=E6=9D=A5=E8=87=AA?= =?UTF-8?q?shengxu=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/order/business/OrderBusiness.java | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java index 0e68756..566d5a0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/business/OrderBusiness.java @@ -150,14 +150,33 @@ public class OrderBusiness { log.error("订单支付异常", ex); throw new ServiceException("支付失败"); } - OrderPayResultDTO orderPayResultDTO = new OrderPayResultDTO(); - orderPayResultDTO.setOrderIdList(orderInfoList.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); + List deviceOrderInfoList = orderInfoList.stream() + .filter(orderInfo -> StringUtils.isNotEmpty(orderInfo.getDeviceOrderId())) + .collect(Collectors.toList()); + List reserveOrderInfoList = orderInfoList.stream() + .filter(orderInfo -> StringUtils.isEmpty(orderInfo.getDeviceOrderId())) + .collect(Collectors.toList()); + if(CollUtil.isNotEmpty(deviceOrderInfoList)) { + OrderPayResultDTO orderPayResultDTO = new OrderPayResultDTO(); + 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);