From 2fe34b5bf75d733bf0cae69a1f8172bf4348a2da Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 15 Sep 2023 14:25:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8E=E7=AE=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/service/OrderService.java | 13 ++++++++++--- .../src/main/resources/application-dev.yml | 8 ++++---- .../jsowell/pile/mapper/MemberWalletLogMapper.java | 2 ++ .../pile/service/IMemberWalletLogService.java | 1 + .../service/impl/MemberWalletLogServiceImpl.java | 5 +++++ .../resources/mapper/pile/MemberWalletLogMapper.xml | 8 ++++++++ 6 files changed, 30 insertions(+), 7 deletions(-) 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 23cd9a2b0..c5312dac4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -437,13 +437,20 @@ public class OrderService { */ private List getOrderRefundInfoList(OrderBasicInfo orderBasicInfo) { List orderRefundInfoList = Lists.newArrayList(); + OrderDetailInfoVO.OrderRefundInfo refundInfo; if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { - // 查新member_wallet_log订单退款记录 - // memberWalletLogService. + // 查新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); + } } else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) { List paymentReverseResponses = orderBasicInfoService.queryOrderAdapayRefund(orderBasicInfo); if (CollectionUtils.isNotEmpty(paymentReverseResponses)) { - OrderDetailInfoVO.OrderRefundInfo refundInfo; for (PaymentReverseResponse reverseResponse : paymentReverseResponses) { refundInfo = new OrderDetailInfoVO.OrderRefundInfo(); refundInfo.setReverseId(reverseResponse.getId()); diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index cde272340..5f02bdae6 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -36,10 +36,10 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_dev -# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_prd_copy + #url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #username: jsowell_dev + url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_prd_copy password: 123456 # 从库数据源 slave: 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 394f5755a..cd723b6fa 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 @@ -82,4 +82,6 @@ public interface MemberWalletLogMapper { * @return */ List getMemberRefundAmount(List memberIds); + + MemberWalletLog 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/IMemberWalletLogService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberWalletLogService.java index 0ecd8bf3c..b0536b8c8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberWalletLogService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberWalletLogService.java @@ -15,4 +15,5 @@ public interface IMemberWalletLogService { int updateByPrimaryKey(MemberWalletLog record); + MemberWalletLog 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 4aa058e09..2bb5151fa 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 @@ -43,4 +43,9 @@ public class MemberWalletLogServiceImpl implements IMemberWalletLogService { return memberWalletLogMapper.updateByPrimaryKey(record); } + @Override + public MemberWalletLog getOrderRecord(String orderCode, String type) { + return memberWalletLogMapper.getOrderRecord(orderCode, type); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml index b9239da73..5698b508a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml @@ -202,4 +202,12 @@ + + \ No newline at end of file