autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-11 18:59:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单支付记录保存支付id

Browse Source
This commit is contained in:
Guoqs
2024-06-04 16:05:14 +08:00
parent 5b61f2d968
commit 9b458d73cb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -1126,10 +1126,11 @@ public class OrderService {
OrderPayRecord orderPayRecord = OrderPayRecord.builder() OrderPayRecord orderPayRecord = OrderPayRecord.builder()
.orderCode(orderCode) .orderCode(orderCode)
.payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue()) .payMode(OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())
.paymentId(paymentId)
.payAmount(amount) .payAmount(amount)
.acquirer(AcquirerEnum.ADAPAY.getValue()) .acquirer(AcquirerEnum.ADAPAY.getValue())
.deductionRecord(JSON.toJSONString(paymentInfo)) .deductionRecord(JSON.toJSONString(paymentInfo))
.createBy(null) .createBy(memberId)
.delFlag(DelFlagEnum.NORMAL.getValue()) .delFlag(DelFlagEnum.NORMAL.getValue())
.build(); .build();
orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord)); orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));

2
jsowell-pile/src/main/resources/mapper/pile/SettleOrderReportMapper.xml
View File

@@ -854,7 +854,7 @@
t1.trade_amount as tradeAmount, t1.trade_amount as tradeAmount,
t1.trade_fee as tradeFee t1.trade_fee as tradeFee
from settle_order_report t1 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' where t1.del_flag = '0'
<if test="dto.merchantId != null and dto.merchantId != ''"> <if test="dto.merchantId != null and dto.merchantId != ''">
and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR} and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}