diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 0de73b383..8a304838e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -471,13 +471,15 @@ public class OrderService { OrderDetailInfoVO.OrderRefundInfo refundInfo; if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { // 查新member_wallet_log订单 进账记录 - MemberWalletLog memberWalletLog = memberWalletLogService.getOrderRecord(orderBasicInfo.getOrderCode(), MemberWalletEnum.TYPE_IN.getValue()); - if (memberWalletLog != null) { - refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); - refundInfo.setReverseAmt(memberWalletLog.getAmount().abs().toString()); - refundInfo.setSucceedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime())); - refundInfo.setCreatedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime())); - orderRefundInfoList.add(refundInfo); + List walletLogs = memberWalletLogService.getOrderRecord(orderBasicInfo.getOrderCode(), MemberWalletEnum.TYPE_IN.getValue()); + if (CollectionUtils.isNotEmpty(walletLogs)) { + for (MemberWalletLog memberWalletLog : walletLogs) { + refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); + refundInfo.setReverseAmt(memberWalletLog.getAmount().abs().toString()); + refundInfo.setSucceedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime())); + refundInfo.setCreatedTime(DateUtils.formatDateTime(memberWalletLog.getCreateTime())); + orderRefundInfoList.add(refundInfo); + } } } else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) { List paymentReverseResponses = orderBasicInfoService.queryOrderAdapayRefund(orderBasicInfo); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java index c90786445..8e77c8c6c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java @@ -91,5 +91,5 @@ public interface MemberWalletLogMapper { */ List getMemberRefundAmount(List memberIds); - MemberWalletLog getOrderRecord(@Param("orderCode") String orderCode, @Param("type") String type); + List getOrderRecord(@Param("orderCode") String orderCode, @Param("type") String type); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletLogService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletLogService.java index 2e5c18c5d..e01c73c4b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletLogService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberWalletLogService.java @@ -29,6 +29,6 @@ public interface MemberWalletLogService { int batchInsert(List list); - MemberWalletLog getOrderRecord(String orderCode, String type); + List getOrderRecord(String orderCode, String type); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java index d22b8de37..ec3569255 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletLogServiceImpl.java @@ -45,7 +45,7 @@ public class MemberWalletLogServiceImpl implements MemberWalletLogService { } @Override - public MemberWalletLog getOrderRecord(String orderCode, String type) { + public List getOrderRecord(String orderCode, String type) { return memberWalletLogMapper.getOrderRecord(orderCode, type); }