diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java index ff2bbd7..e9f6c16 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/controller/OrderInfoController.java @@ -167,7 +167,7 @@ public class OrderInfoController extends BaseController @ResponseBody public AjaxResult refund(@PathVariable("orderId") Long orderId) { - orderInfoService.refund(orderId, StringUtils.EMPTY); + orderInfoService.refund(orderId, StringUtils.EMPTY, true); return AjaxResult.success(); } @@ -177,7 +177,7 @@ public class OrderInfoController extends BaseController public AjaxResult deviceRefund(@RequestBody @Valid DeviceRefundParam param) { OrderInfo orderInfo = orderInfoService.selectOrderInfoBydeviceOrderId(param.getDeviceOrderId()); - orderInfoService.refund(orderInfo.getOrderId(), param.getOperationUser()); + orderInfoService.refund(orderInfo.getOrderId(), param.getOperationUser(), false); return AjaxResult.success(); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java index dcb5dd4..6a147c4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/IOrderInfoService.java @@ -66,7 +66,7 @@ public interface IOrderInfoService */ public int deleteOrderInfoByOrderId(Long orderId); - public void refund(Long orderId, String operationUser); + public void refund(Long orderId, String operationUser, boolean isSendDeviceRefundMQ); public void pay(Long orderId); List orderRefundHistory(OrderRefundHistoryParam param); public void writeOffOrderByOrderIds(OrderWriteOffParam param); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index 39f6088..6b3dff1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -358,7 +358,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService @Override @Transactional(rollbackFor = {Exception.class}) - public void refund(Long orderId, String operationUser) { + public void refund(Long orderId, String operationUser, boolean isSendDeviceRefundMQ) { if(Objects.isNull(orderId) || orderId <= 0) { throw new ServiceException("订单ID不能为空"); } @@ -427,7 +427,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService String jsonString = JacksonUtil.writeValueAsString(bean); log.info("账户变动发送mq内容:{}", jsonString); MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4); - if(StringUtils.isNotBlank(orderInfo.getDeviceOrderId())) { + if(StringUtils.isNotBlank(orderInfo.getDeviceOrderId()) && isSendDeviceRefundMQ) { DeviceRefundOrderBO deviceRefundOrderBO = new DeviceRefundOrderBO(); deviceRefundOrderBO.setDeviceOrderId(orderInfo.getDeviceOrderId()); String deviceJsonString = JacksonUtil.writeValueAsString(deviceRefundOrderBO);