From 8ef73d50c435f6ab19384e83a199cea2fe61a38d Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 13 Sep 2018 10:02:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=80=80=E6=AC=BE=E6=8F=90=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF][=E4=BF=AE=E5=A4=8D]:=E7=94=A8=E6=88=B7=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRefundOrderController.java | 16 ++-------------- .../service/impl/WxRefundOrderServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java index 0528c0bb5..44a084267 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java @@ -10,9 +10,6 @@ import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.po.WxRefundOrder; import com.simple.enums.EnumRefundWay; import com.simple.exception.MallinkException; -import com.simple.service.WxCouponOrderService; -import com.simple.service.WxOrderService; -import com.simple.service.WxPayOrderService; import com.simple.service.WxRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -35,15 +32,6 @@ public class WxRefundOrderController extends BaseController { @Autowired private PayProperty payProperty; - @Autowired - private WxCouponOrderService wxCouponOrderService; - - @Autowired - private WxOrderService wxOrderService; - - @Autowired - private WxPayOrderService wxPayOrderService; - @Autowired private WxRefundOrderService wxRefundOrderService; @@ -69,8 +57,8 @@ public class WxRefundOrderController extends BaseController { WxMerchantBUser bUser = getUser(); WxAppinfo appinfo = getAppInfo(bUser.getAppId()); try { - wxRefundOrderService.createRefundOrder(payProperty.isReal(), appinfo, couponOrderId, EnumRefundWay.B, bUser.getId()); - return new ResultData(); + ResultData rd = wxRefundOrderService.createRefundOrder(payProperty.isReal(), appinfo, couponOrderId, EnumRefundWay.B, bUser.getId()); + return rd; } catch (MallinkException e) { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); 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 a2b8972e0..efde008b1 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java @@ -558,7 +558,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); wxRefundOrderMapper.updateByPrimaryKey(record); - return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), errMsg, returnMap); + return new ResultData(ErrorCode.REFUND_ORDER_ERROR.getCode(), errMsg, returnMap); } } } else {