From 9b458d73cb08df3ed0734c0b3a81bc543685fd33 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 4 Jun 2024 16:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=9D=E5=AD=98=E6=94=AF=E4=BB=98id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 3 ++- .../src/main/resources/mapper/pile/SettleOrderReportMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 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 bd4f4c280..1648d63dd 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1126,10 +1126,11 @@ public class OrderService { OrderPayRecord orderPayRecord = OrderPayRecord.builder() .orderCode(orderCode) .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) + .paymentId(paymentId) .payAmount(amount) .acquirer(AcquirerEnum.ADAPAY.getValue()) .deductionRecord(JSON.toJSONString(paymentInfo)) - .createBy(null) + .createBy(memberId) .delFlag(DelFlagEnum.NORMAL.getValue()) .build(); orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); diff --git a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml index ee5361801..5d2f3ca8a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml @@ -854,7 +854,7 @@ t1.trade_amount as tradeAmount, t1.trade_fee as tradeFee from settle_order_report t1 - join pile_station_info t2 on t1.station_id = t2.id + join pile_station_info t2 on t1.station_id = t2.id where t1.del_flag = '0' and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}