diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index 699163200..b6a6391ab 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,3 +1,105 @@ -002212025041117205810756698506372001792 -002212025041208410110756930042526355456 -002212025041211195610756970037742968832 +002212025041312150410757346298490945536 +002212025041317445210757429295138353152 +002212025041410180310757679237266497536 +002212025041411565310757704109745930240 +002212025041413072510757721862251257856 +002212025041418220110757801033505296384 +002212025041419515110757823639798099968 +002212025041420001910757825772947292160 +002212025041420575910757840284542877696 +002212025041520150610758191881112297472 +002212025041611575910758429163905503232 +002212025041619013410758535761355198464 +002212025041619062910758536998119165952 +002212025041619172510758539748385996800 +002212025041620004810758550667895713792 +002212025041621075710758567568757895168 +002212025041621175910758570090892308480 +002212025041712573710758806559119585280 +002212025041717573310758882038354264064 +002212025041718414110758893143944802304 +002212025041721441910758939106730258432 +002212025041812224510759160171191824384 +002212025041814081510759186722917548032 +002212025041818121910759248143944032256 +002212025041823523810759333785219346432 +002212025041823572410759334986757275648 +002212025041914081710759549118418038784 +002212025042015342510759933183334064128 +002212025042019355810759993972076584960 +002212025042022441110760041336018280448 +002212025042118182710760336848473595904 +002212025042121592310760392451754717184 +002212025042123300510760415274477674496 +002212025042207230310760534299764826112 +002212025042218184610760699316425961472 +002212025042218543910760708349442490368 +002212025042300272510760792092732190720 +002212025042319093110761074477949501440 +002212025042321150610761106080434515968 +002212025042407491910761265688776318976 +002212025042417491110761416647713734656 +002212025042418004610761419562750820352 +002212025042418412510761429791716925440 +002212025042420123410761452731035332608 +002212025042422145710761483531534721024 +002212025042516460310761763147590447104 +002212025042517365710761775957306400768 +002212025042520274110761818923475558400 +002212025042521293510761834503368761344 +002212025042616151710762117793557278720 +002212025042618495710762156717095305216 +002212025042620020410762174864663277568 +002212025042708271710762362405583499264 +002212025042718563710762520782873755648 +002212025042719095310762524121686519808 +002212025042818580010762883520437669888 +002212025042819212110762889393244237824 +002212025042819331410762892385591689216 +002212025042820240710762905188568690688 +002212025042820512810762912074038259712 +002212025042822463410762941038781968384 +002212025042823015310762944892784918528 +002212025043000322510763330063048912896 +002212025043016401710763573636749312000 +002212025043021203610763644178772721664 +002212025043021262610763645648706719744 +002212025050108405110763815370028658688 +002212025050111212610763855783701524480 +002212025050116040710763926922281246720 +002212025050220494010764361172060930048 +002212025050222075010764380842088398848 +002212025050319274910764702960379539456 +002212025050320103110764713707597242368 +002212025050400344610764780206941302784 +002212025050518180210765410176196923392 +002212025050519342910765429413468688384 +002212025050608512610765629975285661696 +002212025050609344210765640860414754816 +002212025050619432510765794049911992320 +002212025050621244010765819531462754304 +002212025050717174910766119795690815488 +002212025050817502810766490402066685952 +002212025050818044410766493992290381824 +002212025050818183910766497493199892480 +002212025050818354710766501807079079936 +002212025050819595510766522980739997696 +002212025050821013510766538498336124928 +002212025050908064210766705879003471872 +002212025050909440910766730403475406848 +002212025050922050710766916875428311040 +002212025050922210410766920890148765696 +002212025051113055910767505970952978432 +002212025051115454710767546186413686784 +002212025051208392210767801263913447424 +002212025051211444210767847903200526336 +002212025051212161510767855844341567488 +002212025051213245110767873109914746880 +002212025051213561110767880994466603008 +002212025051218241210767948442564870144 +002212025051222204710768007978928295936 +002212025051222215210768008254254899200 +002212025051222502910768015456493305856 +002212025051309170710768173152784076800 +002212025051319042310768320944752025600 +002212025051320532410768348378625253376 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 1917c7001..1c0f17845 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -658,17 +658,33 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { orderDetail.setTotalOrderAmount(orderDetail.getTotalElectricityAmount().add(orderDetail.getTotalServiceAmount())); // 总消费金额 } - // 退款金额 - if (refundAmount.compareTo(BigDecimal.ZERO) > 0) { - // 订单退款, 退款金额大于0才退款 - refundOrder(orderBasicInfo); - } + // 退款金额 2025年5月14日16点24分修改为发送订单信息到rabbitMQ, 进行退款和分账 + // if (refundAmount.compareTo(BigDecimal.ZERO) > 0) { + // // 订单退款, 退款金额大于0才退款 + // refundOrder(orderBasicInfo); + // } // 更新数据库 OrderTransactionDTO dto = new OrderTransactionDTO(); dto.setOrderBasicInfo(orderBasicInfo); dto.setOrderDetail(orderDetail); transactionService.doUpdateOrder(dto); + + // 组装after参数 + AfterSettleOrderDTO afterSettleOrderDTO = AfterSettleOrderDTO.builder() + .orderCode(orderBasicInfo.getOrderCode()) + .merchantId(orderBasicInfo.getMerchantId()) + .stationId(orderBasicInfo.getStationId()) + .orderPayAmount(orderBasicInfo.getPayAmount()) // 支付金额 + .orderConsumeAmount(orderBasicInfo.getOrderAmount()) // 消费金额 + .orderSettleAmount(orderBasicInfo.getSettleAmount()) // 结算金额 + .orderElectricityAmount(orderDetail.getTotalElectricityAmount()) // 电费金额 + .orderElectricityDiscountAmount(orderDetail.getDiscountElectricityAmount()) // 电费折扣金额 + .orderServiceAmount(orderDetail.getTotalServiceAmount()) // 服务费金额 + .orderServiceDiscountAmount(orderDetail.getDiscountServiceAmount()) // 服务费折扣金额 + .orderRefundAmount(orderBasicInfo.getRefundAmount()) // 退款金额 + .build(); + rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO); } /**