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 4c7a67a9a..70b7cec2b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -927,7 +927,7 @@ public class OrderService { payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel()); // 判断是微信支付还是汇付支付 - MemberTransactionRecord record = memberTransactionRecordService.selectByOrderCode(orderCode); + MemberTransactionRecord record = memberTransactionRecordService.selectByOrderCode(orderCode, ActionTypeEnum.FORWARD.getValue()); if (record != null) { String paymentInstitutions = record.getPaymentInstitutions(); if (StringUtils.equals(paymentInstitutions, PaymentInstitutionsEnum.WECHAT_PAY.getValue())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberTransactionRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberTransactionRecordMapper.java index 0cfa097c0..f94dcd176 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberTransactionRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberTransactionRecordMapper.java @@ -11,5 +11,5 @@ public interface MemberTransactionRecordMapper { List selectByMemberId(String memberId); - MemberTransactionRecord selectByOrderCode(@Param("orderCode") String orderCode); + MemberTransactionRecord selectByOrderCode(@Param("orderCode") String orderCode, @Param("actionType") String actionType); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java index 0e7201042..918ac9b7f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberTransactionRecordService.java @@ -16,5 +16,11 @@ public interface IMemberTransactionRecordService { List selectMemberTransactionRecordList(String memberId); - MemberTransactionRecord selectByOrderCode(String orderCode); + /** + * 查询会员交易记录 + * @param orderCode + * @param actionType com.jsowell.common.enums.ykc.ActionTypeEnum + * @return + */ + MemberTransactionRecord selectByOrderCode(String orderCode, String actionType); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java index 38424d0e8..bb223dd70 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberTransactionRecordServiceImpl.java @@ -39,8 +39,8 @@ public class MemberTransactionRecordServiceImpl implements IMemberTransactionRec } @Override - public MemberTransactionRecord selectByOrderCode(String orderCode) { - return memberTransactionRecordMapper.selectByOrderCode(orderCode); + public MemberTransactionRecord selectByOrderCode(String orderCode, String actionType) { + return memberTransactionRecordMapper.selectByOrderCode(orderCode, actionType); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 4c596884b..502e5c698 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -670,7 +670,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { weChatRefundDTO.setRefundAmount(residue); // 查到该笔订单付款金额到哪里了 - MemberTransactionRecord transactionRecord = memberTransactionRecordService.selectByOrderCode(orderBasicInfo.getOrderCode()); + MemberTransactionRecord transactionRecord = memberTransactionRecordService.selectByOrderCode(orderBasicInfo.getOrderCode(), ActionTypeEnum.FORWARD.getValue()); logger.info("查到该笔订单付款金额到哪里了:{}", JSON.toJSONString(transactionRecord)); if (StringUtils.equals(transactionRecord.getPaymentInstitutions(), PaymentInstitutionsEnum.WECHAT_PAY.getValue())) { this.weChatRefund(weChatRefundDTO); diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberTransactionRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberTransactionRecordMapper.xml index 05a654356..fa6535950 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberTransactionRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberTransactionRecordMapper.xml @@ -124,5 +124,6 @@ FROM `member_transaction_record` where del_flag = '0' and order_code = #{orderCode} + and action_type = #{actionType} \ No newline at end of file