From 6dd1b216f4320e9ce34d2c5b1ed48a3d85560279 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 15 Mar 2019 11:39:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8F=82=E5=9B=A2=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxOrderGroupServiceImpl.java | 3 +-- .../service/impl/WxRefundOrderServiceImpl.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index b63cae5a2..1db889fc8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -218,8 +218,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { return o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) || o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) || - o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()) || - o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); + o.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); }).sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList()); if (!orderList.isEmpty()) { List userList = new ArrayList<>(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index e01156523..ee4f58865 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -1337,14 +1337,14 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); final IdWorker idWorker = IdWorker.get(); Date currentDate = new Date(); - wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); - wxOrder.setUpdateDate(currentDate); - try { - wxOrderMapper.updateByPrimaryKeySelective(wxOrder); - } catch (Exception e) { - logger.error("订单修改出错: " + e.getMessage()); - throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单修改出错"); - } +// wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); +// wxOrder.setUpdateDate(currentDate); +// try { +// wxOrderMapper.updateByPrimaryKeySelective(wxOrder); +// } catch (Exception e) { +// logger.error("订单修改出错: " + e.getMessage()); +// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单修改出错"); +// } // 查找支付订单 WxPayOrder payOrderQ = new WxPayOrder();