diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index f18854dcb..459946e38 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxSharingOrderDto; import com.iformall.domain.po.*; @@ -295,7 +296,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { shareOrder.setTransactionId(cardInfo.getTransactionId()); shareOrder.setShareAmount(cardSpend.getRealPayment()); ResultData resultData = profitSharingOrderService.createSharingOrder(shareOrder); - if(resultData.code != 200) { + if(resultData.code != Result.SUCCESS) { // 分账异常 throw new MallinkException(resultData.code, resultData.message); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 35a3fbbfa..1c1eab2b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -952,22 +952,22 @@ public class WxOrderServiceImpl implements WxOrderService { if (wxPayOrder != null && wxMerchantBUser != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { - WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); - wxSharingOrderDto.setcUserId(wxPayOrder.getcUserId()); - wxSharingOrderDto.setMerchantId(wxMerchantBUser.getMerchantId()); - wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); - wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); - wxSharingOrderDto.setOrderId(wxPayOrder.getId()); - wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); - wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); - wxSharingOrderDto.setTenantId(wxPayOrder.getTenantId()); - wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); - wxSharingOrderDto.setShareAmount(wxPayOrder.getShareAmount()); - wxProfitSharingOrderService.createSharingOrder(wxSharingOrderDto); + WxSharingOrderDto sharingOrder = new WxSharingOrderDto(); + sharingOrder.setcUserId(wxPayOrder.getcUserId()); + sharingOrder.setMerchantId(wxMerchantBUser.getMerchantId()); + sharingOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); + sharingOrder.setPayAmount(wxPayOrder.getPayAmount()); + sharingOrder.setOrderId(wxPayOrder.getId()); + sharingOrder.setPayTimeStart(wxPayOrder.getPayTimeStart()); + sharingOrder.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); + sharingOrder.setTenantId(wxPayOrder.getTenantId()); + sharingOrder.setTransactionId(wxPayOrder.getTransactionId()); + sharingOrder.setShareAmount(wxPayOrder.getShareAmount()); + ResultData resultData = wxProfitSharingOrderService.createSharingOrder(sharingOrder); } else { logger.error("微信分账: 未找到payorder or merchant at orderid-" + orderId); } - } catch (Exception e) { + } catch (MallinkException e) { logger.error("微信分账: " + e.getMessage()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 260cf29e4..6e4df88aa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1331,7 +1331,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.info("订单分账开始: orderId: {}, payOrderId: {}", orderId, payOrderId); try { wxOrderService.shareForMicroPay(tenantId, orderId, payOrderId); - } catch (Exception e) { + } catch (MallinkException e) { logger.error("订单分账失败: orderId: {}, payOrderId: {}", orderId, payOrderId); logger.error("订单分账失败: " +e.getMessage()); }