From 4c4646819beb205c070c34737c0b94d7084d548f Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@192.168.1.106> Date: 星期二, 03 三月 2020 13:19:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java index baa0a3b..0572dd7 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java @@ -238,11 +238,11 @@ update.setId(lo.getId()); update.setResultCode(LostOrder.RESULT_CODE_SUCCESS); lostOrderMapper.updateByPrimaryKeySelective(update); - Order order = orderService.findOrderByOrderIdAndType(orderId, Order.ORDER_TYPE_TAOBAO); + Order order = orderService.findOrderByOrderIdAndType(orderId, orderType); if (order != null) // 娣诲姞閫氱煡 userOrderMsgNotificationService.orderFoundSuccess(lo.getUserInfo().getId(), lo.getOrderId(), - order.getMoney(), 1, new Date(lo.getHandleTime())); + order.getMoney(), orderType, new Date(lo.getHandleTime())); } } } -- Gitblit v1.8.0