订单支付记录保存支付id

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));

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'
         <if test="dto.merchantId != null and dto.merchantId != ''">
             and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}