From 37cfebf33050b4ab802a75fe43bc2016c3579f63 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Wed, 15 Aug 2018 21:06:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=80=80=E6=AC=BE=E5=9B=9E=E8=B0=83][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E5=BE=AE=E4=BF=A1=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxPayOrderServiceImpl.java | 14 ++++----- .../impl/WxRefundOrderServiceImpl.java | 30 +++++++++++-------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 0dda1ca2f..508939db2 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -262,13 +262,13 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { Date currentDate = new Date(); // 修改支付订单状态 try { - WxPayOrder updatePayOrder = new WxPayOrder(); - updatePayOrder.setId(record.getId()); - updatePayOrder.setOrderId(record.getOrderId()); - updatePayOrder.setUpdateTime(currentDate); - updatePayOrder.setPayOrderStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); - updatePayOrder.setTransactionId(transactionId); - wxPayOrderMapper.updateByPrimaryKeySelective(updatePayOrder); + WxPayOrder updateOrder = new WxPayOrder(); + updateOrder.setId(record.getId()); + updateOrder.setOrderId(record.getOrderId()); + updateOrder.setUpdateTime(currentDate); + updateOrder.setPayOrderStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); + updateOrder.setTransactionId(transactionId); + wxPayOrderMapper.updateByPrimaryKeySelective(updateOrder); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java index bc9674490..a8bd70173 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.simple.mapper.*; import com.simple.pay.WxPay; import com.simple.pay.WxPayment; import com.simple.pay.WxRefundOrderP; +import com.simple.service.WxOrderService; import com.simple.service.WxRefundOrderService; import com.simple.utils.BeanUtils; import com.simple.utils.Utility; @@ -48,6 +49,9 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Autowired WxPayAccountMapper wxPayAccountMapper; + @Autowired + WxOrderService wxOrderService; + JSONObject errorRefundReqMap = JSON.parseObject("{\n" + " \"SYSTEMERROR\": {\n" + " \"detail\": \"接口返回错误\",\n" + @@ -433,23 +437,24 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { "is paid success , orderId : " + refundOrder.getOrderId()); return; } - /* - WxOrder order = wxRefundOrderMapper.selectByPrimaryKey(record.getOrderId()); + + WxOrder order = wxOrderMapper.selectByPrimaryKey(refundOrder.getOrderId()); if (order == null) { - logger.error("pay success handle, order " + record.getOrderId() +" not found , payOrderGid : " + record.getPayOrderNo()); + logger.error("pay success handle, order " + refundOrder.getOrderId() +" not found , refundId : " + refundOrder.getId()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } Date currentDate = new Date(); - // 修改支付订单状态 + // 修改退款订单状态 try { - WxPayOrder updatePayOrder = new WxPayOrder(); - updatePayOrder.setId(record.getId()); - updatePayOrder.setOrderId(record.getOrderId()); - updatePayOrder.setUpdateTime(currentDate); - updatePayOrder.setPayOrderStatus(EnumPayStatus.PAY_WAY_SUCCESS.getCode()); - updatePayOrder.setTransactionId(transactionId); - wxPayOrderMapper.updateByPrimaryKeySelective(updatePayOrder); + WxRefundOrder updateOrder = new WxRefundOrder(); + updateOrder.setId(refundOrder.getId()); + updateOrder.setOrderId(refundOrder.getOrderId()); + updateOrder.setUpdateTime(currentDate); + updateOrder.setRefundOrderStatus(EnumRefundStatus.REFUND_SUCCESS.getCode()); + updateOrder.setTransactionId(transactionId); + updateOrder.setRefundId(refundId); + wxRefundOrderMapper.updateByPrimaryKeySelective(updateOrder); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); @@ -457,12 +462,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 修改订单状态 try { - wxOrderService.updateOrderStatus(order.getId(), EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS); + wxOrderService.updateOrderStatus(order.getId(), EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); } catch (Exception e) { logger.error(e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL); } - */ /* Map msgMap = new HashMap<>(); try {