From b738439cf777c06a950fde652a6e68a98b3b7793 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 13 Oct 2025 16:22:25 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/PaymentTestController.java | 3 +- jsowell-admin/src/test/resources/payment_ids | 213 ++++++++++-------- .../impl/OrderBasicInfoServiceImpl.java | 3 +- 3 files changed, 118 insertions(+), 101 deletions(-) diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index 5b5e48b99..a0a612476 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -89,8 +89,7 @@ public class PaymentTestController { StopWatch stopWatch = new StopWatch("批量查询分账信息"); List paymentIdList = getPaymentIdList(); // 查询分账信息 stopWatch.start(); - // Map> splitInfoMap = adapayService.getSplitInfoMapByPaymentIdList(paymentIdList); - Map> splitInfoMap = adapayService.getSplitInfoMapByPaymentIdListNew(paymentIdList); + Map> splitInfoMap = adapayService.getSplitInfoMapByPaymentIdList(paymentIdList); stopWatch.stop(); System.out.println("耗时:" + stopWatch.getLastTaskTimeMillis() + ", splitInfoMap:" + JSON.toJSONString(splitInfoMap)); } diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index f2052e97d..af4b8804a 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,98 +1,115 @@ -002212025092422460010816936686655008768 -002212025092423313610816948163185098752 -002212025092501082510816972528182263808 -002212025092501252510816976807009886208 -002212025092501464410816982171293986816 -002212025092502170410816989806579834880 -002212025092502403710816995731088748544 -002212025092502411410816995887678930944 -002212025092502540810816999135018131456 -002212025092503480810817012722704990208 -002212025092504090010817017974938329088 -002212025092504190510817020509719789568 -002212025092504364510817024957774991360 -002212025092505500610817043417150136320 -002212025092505565510817045134101094400 -002212025092505591510817045717755256832 -002212025092506582610817060614635433984 -002212025092507221910817066622455824384 -002212025092508142210817079724068978688 -002212025092508192110817080976538488832 -002212025092509183810817095895002562560 -002212025092509215610817096726900793344 -002212025092509393410817101165929836544 -002212025092510060210817107826073583616 -002212025092510063410817107958991036416 -002212025092510171910817110666091339776 -002212025092510185910817111081763618816 -002212025092510320510817114382286594048 -002212025092510533310817119780993421312 -002212025092511060510817122937530109952 -002212025092511150510817125201909002241 -002212025092511312310817129305276334080 -002212025092511462110817133071241203712 -002212025092511475310817133457243004928 -002212025092512015410817136983100764160 -002212025092512105510817139253880188928 -002212025092512110510817139294275547136 -002212025092512410110817146826213728256 -002212025092512450310817147844448133120 -002212025092512515910817149589274382336 -002212025092512575510817151082027180032 -002212025092513020610817152133404975104 -002212025092513090810817153902570786816 -002212025092513151310817155432434790400 -002212025092513194110817156560174104576 -002212025092513215710817157130469396480 -002212025092513444510817162865626505217 -002212025092513491610817164004430344192 -002212025092513581810817166278347071488 -002212025092514051210817168011202826240 -002212025092514053010817168088931676160 -002212025092514113710817169629604356096 -002212025092514153710817170635994087424 -002212025092514380410817176284538744832 -002212025092514382710817176381662056448 -002212025092514425910817177521917186048 -002212025092514484810817178983015522304 -002212025092514543910817180455715393536 -002212025092515012210817182146405781504 -002212025092515045210817183029668458496 -002212025092515083410817183960518725632 -002212025092515190610817186609028628480 -002212025092515214010817187257849995264 -002212025092515305110817189569078820864 -002212025092515524910817195096169058304 -002212025092516062610817198524236935168 -002212025092516223210817202575871541248 -002212025092516344610817205651571425280 -002212025092517073110817213893408296960 -002212025092517130410817215290598068224 -002212025092517155410817216005877596160 -002212025092517254910817218498380660736 -002212025092517342210817220650008264704 -002212025092517452810817223444555431936 -002212025092518125010817230330155720704 -002212025092518183610817231781762244608 -002212025092518384710817236864210415616 -002212025092518441910817238256748548096 -002212025092518444710817238373555728384 -002212025092519233010817248117595299840 -002212025092519312910817250126167498752 -002212025092519454910817253730513133568 -002212025092519510810817255070291578880 -002212025092520075610817259297642340352 -002212025092520113210817260202106404864 -002212025092520150510817261096478810112 -002212025092520353110817266238502416384 -002212025092520402510817267474022604800 -002212025092520555210817271361358385152 -002212025092521124710817275619163992064 -002212025092521200610817277458341130240 -002212025092521503310817285120017375232 -002212025092521512110817285324531789824 -002212025092521565110817286706165035008 -002212025092522294710817294996009615360 -002212025092522320710817295583728062464 -002212025092522345910817296304284315648 -002212025092523013710817303007121850368 \ No newline at end of file +002212025091323504710812966726266179584 +002212025091323551610812967854542348288 +002212025091323443510812965166807146496 +002212025091400460010812980620632162304 +002212025091320185210812913395464314880 +002212025091400251110812975382261035008 +002212025091401044010812985316553957376 +002212025091321044610812924946841747456 +002212025091401223210812989815599304704 +002212025091401293010812991566205321216 +002212025091322382710812948523603357696 +002212025091402331310813007603441246208 +002212025091403104610813017054747455488 +002212025091403470510813026193569619968 +002212025091403364510813023593319256064 +002212025091404221510813035044029210624 +002212025091404371410813038812812689408 +002212025091404242510813035588512813056 +002212025091405395910813054603603902464 +002212025091406230510813065451386855424 +002212025091401233010812990058088808448 +002212025091407071710813076574286831616 +002212025091407263010813081411581816832 +002212025091407361210813083852087906304 +002212025091407084910813076959223275520 +002212025091407412710813085173478223872 +002212025091408295310813097361051901952 +002212025091409055210813106416067706880 +002212025091409365110813114214897831936 +002212025091409272910813111855262109696 +002212025091409260410813111500675629056 +002212025091410255910813126576514179072 +002212025091409083010813107077513621504 +002212025091409302010813112574920761344 +002212025091410101510813122618047504384 +002212025091410192110813124908439486464 +002212025091410385710813129843407204352 +002212025091409192310813109818684239872 +002212025091410455010813131572060274688 +002212025091410404310813130285528797184 +002212025091410444310813131292816068608 +002212025091411062110813136738331271168 +002212025091410343310813128734659739648 +002212025091411305910813142936145289216 +002212025091411585210813149954511876096 +002212025091412445910813161557793845248 +002212025091408225810813095620038254592 +002212025091412331610813158610146066432 +002212025091412292110813157626892177408 +002212025091412525110813163537643749376 +002212025091409393410813114895717285888 +002212025091413244110813171551461335040 +002212025091413181710813169938273316864 +002212025091413423410813176050271830016 +002212025091413222710813170987423911936 +002212025091414370510813189770993639424 +002212025091408351410813098707633233920 +002212025091412562310813164429981937664 +002212025091414283810813187644049477632 +002212025091414390410813190270287757312 +002212025091414544410813194211247403008 +002212025091414384510813190187345399808 +002212025091414001410813180495349071872 +002212025091414072510813182304213950464 +002212025091415322510813203695797710848 +002212025091414383910813190162494160896 +002212025091414511810813193346000244736 +002212025091415255110813202040716967936 +002212025091415124610813198748830040064 +002212025091415123710813198712264122368 +002212025091415473310813207501956612096 +002212025091415522110813208713183526912 +002212025091416120910813213693135167488 +002212025091416081810813212724188041216 +002212025091416244110813216848996638720 +002212025091417004010813225903483965440 +002212025091417153010813229638322929664 +002212025091417100710813228283608870912 +002212025091416503010813223346745298944 +002212025091417554710813239775674687488 +002212025091418050310813242105556033536 +002212025091417411110813236100013109248 +002212025091417544010813239495444807680 +002212025091418044110813242013499428864 +002212025091417453210813237196660043776 +002212025091418033210813241723878522880 +002212025091418160310813244875486969856 +002212025091418183410813245508386480128 +002212025091418213310813246258814541824 +002212025091418344810813249592980025344 +002212025091418512510813253775414153216 +002212025091419440810813267040580022272 +002212025091419032110813256776832937984 +002212025091419304310813263667147456512 +002212025091419405810813266245151260672 +002212025091419441810813267082254647296 +002212025091420431010813281899749203968 +002212025091420285010813278289128751104 +002212025091420150210813274815905308672 +002212025091420134410813274489814921216 +002212025091419284510813263169380052992 +002212025091421051710813287463464112128 +002212025091421285010813293388618973184 +002212025091421233010813292046483623936 +002212025091420425110813281820279746560 +002212025091421300510813293705242796032 +002212025091421330710813294468501250048 +002212025091422054510813302682269704192 +002212025091422082910813303367019192320 +002212025091422084910813303452255789056 +002212025091422432510813312159203098624 +002212025091422075510813303225775972352 +002212025091422201410813306326205493248 +002212025091422173810813305670677721088 +002212025091422075710813303232398761984 \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 399486ac0..cb7f415cc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2358,6 +2358,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { public List calculationSplitDataList(List stationSplitConfigList, AfterSettleOrderDTO afterSettleOrderDTO) { List resultList = Lists.newArrayList(); OrderBasicInfo orderBasicInfo = afterSettleOrderDTO.getOrderBasicInfo(); + String orderCode = afterSettleOrderDTO.getOrderCode(); // totalElecSplitRatio和totalServiceSplitRatio 都等于100%, 才进行后续操作 boolean verifySplitConfig = stationSplitConfigService.verifySplitConfig(stationSplitConfigList); @@ -2373,7 +2374,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .subtract(afterSettleOrderDTO.getOrderServiceDiscountAmount() != null ? afterSettleOrderDTO.getOrderServiceDiscountAmount() : BigDecimal.ZERO); // 校验 结算金额 = 需要分成的电费金额 + 需要分成的服务费金额 if (orderElectricityAmount.add(orderServiceAmount).compareTo(afterSettleOrderDTO.getOrderSettleAmount()) != 0) { - logger.info("订单结算金额:{}与需要分成的电费金额:{}+需要分成的服务费金额:{}不相等", afterSettleOrderDTO.getOrderSettleAmount(), orderElectricityAmount, orderServiceAmount); + logger.info("订单:{}, 结算金额:{}与需要分成的电费金额:{}+需要分成的服务费金额:{}不相等", orderCode, afterSettleOrderDTO.getOrderSettleAmount(), orderElectricityAmount, orderServiceAmount); return resultList; } // stationSplitConfigList按照是否承担手续费排序，将承担手续费的放在最后