diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index 03b7b0118..4a042fa41 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -376,7 +376,7 @@ public class TempController extends BaseController { */ @PostMapping("/generateMerchantBill") public RestApiResponse generateMerchantBill(@RequestBody QueryOrderDTO dto) { - logger.info("手动接口执行订单分账逻辑-param:{}", JSON.toJSONString(dto)); + logger.info("手动生成运营商日报-param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { // 查询运营商列表 @@ -394,7 +394,7 @@ public class TempController extends BaseController { try { orderBasicInfoService.generateMerchantBill(merchantId, tradeDate); } catch (Exception e) { - logger.error("生成运营商日报异常, merchantId:{}", merchantId, e); + logger.error("手动生成运营商日报, merchantId:{}", merchantId, e); } }); } diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index c45366cd3..e023b2a4a 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,10 +1,785 @@ +002212025030318504410742587967625068544 +002212025030321240810742626574550953984 +002212025030321241910742626617827614720 +002212025030322294810742643097998999552 +002212025030322342310742644253637820416 +002212025030323103010742653342577102848 +002212025030400084210742667988435709952 +002212025030401021610742681470429048832 +002212025030401023610742681553490128896 +002212025030401195410742685906368516096 +002212025030404503610742738929335156736 +002212025030408090510742788880547475456 +002212025030408191810742791453324865536 +002212025030408374110742796077146398720 +002212025030412241210742853081712275456 +002212025030417350010742931299578167296 +002212025030417425210742933278615416832 +002212025030417490910742934861016494080 +002212025030418114810742940560971321344 +002212025030418252810742943997097988096 +002212025030418314110742945564388265984 +002212025030418434210742948585694310400 +002212025030418555510742951662240395264 +002212025030419060610742954222414491648 +002212025030419115910742955703060377600 +002212025030419122710742955821849407488 +002212025030419300510742960259028992000 +002212025030420415110742978320446574592 +002212025030420514210742980799579844608 +002212025030421100610742985428931805184 +002212025030421180810742987451489673216 +002212025030421211510742988234808705024 +002212025030421342110742991530910339072 +002212025030422035510742998974001090560 +002212025030422043410742999137706627072 +002212025030422070510742999769795805184 +002212025030422235510743004008079740928 +002212025030423251210743019428972421120 +002212025030500333110743036622305488896 +002212025030508194510743153951870824448 +002212025030508225110743154733939683328 +002212025030508402110743159136669380608 +002212025030508404410743159232568066048 +002212025030511254210743200746649939968 +002212025030512443310743220590031224832 +002212025030515083910743256857547997184 +002212025030516375110743279304722640896 +002212025030517043010743286010697510912 +002212025030517243810743291076442406912 +002212025030517352410743293787281829888 +002212025030517571910743299300244602880 +002212025030518303910743307691835027456 +002212025030518343910743308697967054848 +002212025030518470610743311828965212160 +002212025030518493310743312449050562560 +002212025030519014510743315516592541696 +002212025030519044810743316285737156608 +002212025030519194910743320062452056064 +002212025030519210710743320390962802688 +002212025030520055110743331649429229568 +002212025030520160310743334214115885057 +002212025030520284610743337416011837440 +002212025030520355310743339208616194048 +002212025030520421010743340789641756672 +002212025030521234910743351269445332992 +002212025030521523010743358489155166208 +002212025030521572310743359715580891136 +002212025030522084410743362574475603968 +002212025030522133810743363807121764352 +002212025030522500910743372997941030912 +002212025030600040110743391587186606080 +002212025030600163410743394745241710592 +002212025030603494210743448382258823168 +002212025030608380710743520961465167872 +002212025030614424210743612713619828736 +002212025030615001510743617130734370816 +002212025030615553010743631032012034048 +002212025030617551710743661178433622016 +002212025030618241710743668474769362944 +002212025030618260210743668916714786816 +002212025030618362910743671545189142528 +002212025030618372110743671766618308608 +002212025030618462310743674039891378176 +002212025030618480410743674463801847808 +002212025030618492610743674807729537024 +002212025030619045110743678687067516928 +002212025030619103010743680105569988608 +002212025030620083810743694738046140416 +002212025030620231310743698405220429824 +002212025030621143510743711332454658048 +002212025030621234710743713648832393216 +002212025030621241810743713778587500544 +002212025030621280210743714719498293248 +002212025030622042710743723883614474240 +002212025030622100810743725311707877376 +002212025030622400410743732847887343616 +002212025030623395710743747918368178176 +002212025030702354610743792162179104768 +002212025030702370510743792493184675840 +002212025030703475610743810324211167232 +002212025030708302310743881404685828096 +002212025030710284510743911193525452800 +002212025030711304010743926775936802816 +002212025030711590110743933908187365376 +002212025030712412910743944596183093248 +002212025030713094010743951687590854656 +002212025030717344310744018391703044096 +002212025030717493210744022119889846272 +002212025030717515410744022716189298688 +002212025030718141810744028350295031808 +002212025030718391910744034648384946176 +002212025030718395510744034799425257472 +002212025030718570510744039117623185408 +002212025030719031310744040661632208896 +002212025030719031810744040682410618880 +002212025030719080810744041899496931328 +002212025030719263410744046540569686016 +002212025030719382010744049501247139840 +002212025030719563810744054105780006912 +002212025030720004310744055134645907456 +002212025030720174510744059420824285184 +002212025030720183910744059644403806208 +002212025030720483910744067196361621504 +002212025030721111810744072895195803648 +002212025030721380110744079620944789504 +002212025030722072910744087036189773824 +002212025030722132710744088537997561856 +002212025030722192210744090026037493760 +002212025030722550110744098998728314880 +002212025030723423710744110974292180992 +002212025030805292510744198248994275328 +002212025030808554110744250158658613248 +002212025030810021210744266897726410752 +002212025030810524610744279623020326912 +002212025030812184410744301257437491200 +002212025030813573910744326153365184512 +002212025030814204710744331972939493376 +002212025030814493010744339201237766144 +002212025030815441210744352967786770432 +002212025030815565310744356155980025856 +002212025030817010010744372291815133184 +002212025030817021410744372602568949760 +002212025030817054810744373499642003456 +002212025030817332810744380463881416704 +002212025030817455010744383575298199552 +002212025030818045210744388367630766080 +002212025030818111410744389967211974656 +002212025030818290110744394441994625024 +002212025030819011310744402545598148608 +002212025030819104310744404935923609600 +002212025030819110810744405041255165952 +002212025030819165410744406495237521408 +002212025030820033810744418252571099136 +002212025030820311210744425190327402496 +002212025030820402510744427512851214336 +002212025030821023510744433088702984192 +002212025030821030310744433209268031488 +002212025030822063610744449199115689984 +002212025030822213910744452987554902016 +002212025030822331710744455913410711552 +002212025030822433910744458523639119872 +002212025030823021410744463200507916288 +002212025030823141510744466223926882304 +002212025030823213310744468062648455168 +002212025030823250110744468933858086912 +002212025030823260910744469219452661760 +002212025030823492910744475089948618752 +002212025030900122810744480873712201728 +002212025030900174110744482189865992192 +002212025030901142110744496448400052224 +002212025030908442710744609719805579264 +002212025030909491210744626014915014656 +002212025030911240010744649873768677376 +002212025030912095610744661431649038336 +002212025030912201510744664027128639488 +002212025030912360910744668030489866240 +002212025030913043110744675170000359424 +002212025030915570910744718614071885824 +002212025030916040710744720364862455808 +002212025030916042410744720439226482688 +002212025030916223710744725022088417280 +002212025030917222610744740076248420352 +002212025030917564610744748714652053504 +002212025030917593110744749405389508608 +002212025030918123310744752687138787328 +002212025030918160410744753572084023296 +002212025030918331310744757888433881088 +002212025030919403710744774848435208192 +002212025030919415010744775155120844800 +002212025030919491810744777034409000960 +002212025030920012810744780097917317120 +002212025030920120510744782770041835520 +002212025030920162710744783866524626944 +002212025030920355410744788762577846272 +002212025030921023010744795455485214720 +002212025030921215510744800344688963584 +002212025030921324610744803072183459840 +002212025030921492810744807274424315904 +002212025030922032410744810784345010176 +002212025030922061910744811515075375104 +002212025030922160210744813961801420800 +002212025030922385010744819701423575040 +002212025030922454010744821420978438144 +002212025031003372310744894831239663616 +002212025031008110410744963708585299968 +002212025031008331010744969269105483776 +002212025031009445910744987340708864000 +002212025031013271810745043289495072768 +002212025031014143910745055206481620992 +002212025031014240210745057565190418432 +002212025031016234310745087685722615808 +002212025031018001910745111994631208960 +002212025031018020010745112420382916608 +002212025031018101810745114508072075264 +002212025031018123010745115061874364416 +002212025031018442110745123078537199616 +002212025031018442410745123090451697664 +002212025031018500510745124522065973248 +002212025031019172310745131390498271232 +002212025031019283310745134201009655808 +002212025031019471210745138895856857088 +002212025031019535110745140568519118848 +002212025031020042210745143213478432768 +002212025031020301010745149706334715904 +002212025031020420710745152715018821632 +002212025031021400210745167288493142016 +002212025031021584510745172000590671872 +002212025031022404410745182564993871872 +002212025031023281310745194513295093760 +002212025031104512510745275850353901568 +002212025031108060410745324835108827136 +002212025031108414310745333810153271296 +002212025031113011210745399109460262912 +002212025031113374210745408293926617088 +002212025031114371410745423276010909696 +002212025031114412910745424345750302720 +002212025031115450810745440365517238272 +002212025031117325810745467499675627520 +002212025031117511210745472088426430464 +002212025031118122010745477406477791232 +002212025031118133810745477735317540864 +002212025031118423410745485017102733312 +002212025031119015610745489890512224256 +002212025031119331610745497775512584192 +002212025031119421910745500052743602176 +002212025031120364710745513759707377664 +002212025031120595110745519564498964480 +002212025031121135610745523110893350912 +002212025031122034510745535647655129088 +002212025031122082810745536833728634880 +002212025031122210210745539997991432192 +002212025031122292410745542103451340800 +002212025031122595710745549789252866048 +002212025031123023610745550456158171136 +002212025031123030610745550582355156992 +002212025031203165210745614443127484416 +002212025031212133010745749491976515584 +002212025031212330310745754414153764864 +002212025031212444510745757356223139840 +002212025031212454410745757606899232768 +002212025031213305910745768993272725504 +002212025031215134010745794834486554624 +002212025031217545510745835415141335040 +002212025031217562510745835789302943744 +002212025031218070810745838488112910336 +002212025031218071810745838528345227264 +002212025031218494710745849221489868800 +002212025031219124610745855004537012224 +002212025031219395110745861821109948416 +002212025031219444410745863048609148928 +002212025031219510410745864643809259520 +002212025031220081410745868963454177280 +002212025031220460710745878496481374208 +002212025031220465710745878707381710848 +002212025031220561910745881065713139712 +002212025031221433510745892959278911488 +002212025031221480510745894093115109376 +002212025031222004110745897263688138752 +002212025031222124210745900284653355008 +002212025031222310910745904928225050624 +002212025031223005510745912419437801472 +002212025031223044210745913374199529472 +002212025031223111210745915009672949760 +002212025031300261610745933898250207232 +002212025031300394410745937289761050624 +002212025031302014810745957943526436864 +002212025031302290510745964809184854016 +002212025031307564610746047271072153600 +002212025031308512210746061010703724544 +002212025031309210910746068506320080896 +002212025031311070110746095148697628672 +002212025031313075710746125585359360000 +002212025031313293910746131043913822208 +002212025031313422510746134259393118208 +002212025031314171510746143025249677312 +002212025031318001110746199127570857984 +002212025031318143810746202761175552000 +002212025031318181310746203666314571776 +002212025031318235410746205095872512001 +002212025031318324710746207331058286592 +002212025031318325110746207348074459136 +002212025031318352810746208007253147648 +002212025031318354010746208056583401472 +002212025031318354010746208058327461888 +002212025031318430410746209920614920192 +002212025031318511310746211968436195328 +002212025031319125010746217407653081088 +002212025031319164510746218394164232192 +002212025031319390010746223995841818624 +002212025031320061810746230866264453120 +002212025031320270510746236094641614848 +002212025031320443110746240481658548224 +002212025031321211610746249732012195840 +002212025031322063910746261151482941440 +002212025031322195410746264487448801280 +002212025031322312410746267380134735872 +002212025031401130510746308070963974144 +002212025031402241310746325971996749824 +002212025031402380510746329460569010176 +002212025031404375010746359595162492928 +002212025031408170910746414791288774656 +002212025031408271110746417314133270528 +002212025031408543510746424210941816832 +002212025031409525110746438872461565952 +002212025031410225110746446424741285888 +002212025031412083810746473044521775104 +002212025031413103110746488618917310464 +002212025031413245310746492231759708160 +002212025031415541610746529827806244864 +002212025031417375410746555907322466304 +002212025031417482010746558532662325248 +002212025031417594010746561385368924160 +002212025031418180410746566014193385472 +002212025031418243710746567662215393280 +002212025031418273010746568387032604672 +002212025031419284610746583807660376064 +002212025031419495910746589145618808832 +002212025031419522510746589759561789440 +002212025031420000210746591677191868416 +002212025031420330910746600008469737472 +002212025031420380610746601254869790720 +002212025031420485310746603971158773760 +002212025031420492710746604110980091904 +002212025031421374410746616262953361408 +002212025031422213110746627280648040448 +002212025031422413310746632324783157248 +002212025031422435110746632901899141120 +002212025031422493110746634329186467840 +002212025031423145510746640720886550528 +002212025031423181910746641576929800192 +002212025031423460010746648542203867136 +002212025031423551010746650850043977728 +002212025031501475010746679200597970944 +002212025031504123010746715607337091072 +002212025031507192010746762628608798720 +002212025031508172210746777230798045184 +002212025031509191610746792810351509504 +002212025031510075310746805043408224256 +002212025031510380610746812648565649408 +002212025031510524310746816325559308288 +002212025031512362110746842407527342080 +002212025031512402310746843421788393472 +002212025031514180210746867995755503616 +002212025031515061610746880134026375168 +002212025031515361710746887689031204864 +002212025031515493910746891050551062528 +002212025031516272410746900551996112896 +002212025031516440610746904754150453248 +002212025031517081010746910811746258944 +002212025031517274110746915722347687936 +002212025031517553610746922749569892352 +002212025031518043810746925024038891520 +002212025031518230110746929648070307840 +002212025031518292510746931260653813760 +002212025031518301910746931486038421504 +002212025031519173710746943388628385792 +002212025031519263510746945647055613952 +002212025031519271210746945800395853824 +002212025031519574310746953479488028672 +002212025031520582610746968759472541696 +002212025031521335710746977697257762816 +002212025031522193210746989171168038912 +002212025031522232910746990162275201024 +002212025031522342310746992907618127872 +002212025031522345410746993036000854016 +002212025031522485210746996552149536768 +002212025031522490110746996588802879488 +002212025031523020610746999880761094144 +002212025031523145310747003098997735424 +002212025031523551210747013247253647360 +002212025031603183110747064410052636672 +002212025031609492510747162783825563648 +002212025031610313310747173387633405952 +002212025031610423310747176156244033536 +002212025031611210510747185853369978880 +002212025031613135710747214256492068864 +002212025031613194210747215702829969408 +002212025031613211910747216109069455360 +002212025031613545610747224569630523392 +002212025031614230110747231636583972864 +002212025031616220010747261581662072832 +002212025031616274510747263028780838912 +002212025031616403910747266275789541376 +002212025031616541510747269699351924736 +002212025031617224210747276855956238336 +002212025031618154710747290218139258880 +002212025031619153110747305249577910272 +002212025031619292910747308761584381952 +002212025031619365310747310626416635904 +002212025031619422710747312027105853440 +002212025031619463010747313047165505536 +002212025031620060410747317968987467776 +002212025031620124610747319654248378368 +002212025031620133110747319844655214592 +002212025031620144210747320144327852032 +002212025031620191210747321273069584384 +002212025031620315510747324473775001600 +002212025031620594310747331472994680832 +002212025031621400610747341635991388160 +002212025031621461610747343184402575360 +002212025031621554310747345565085351936 +002212025031622275410747353661392580608 +002212025031622291210747353988584058880 +002212025031622362410747355804353511424 +002212025031704332410747445644836716544 +002212025031706351710747476315486109696 +002212025031708172410747502016364888064 +002212025031708423710747508363715440640 +002212025031709492010747525151310360576 +002212025031710560210747541936080257024 +002212025031711294810747550436532170752 +002212025031715193410747608258109648896 +002212025031716315010747626444278231040 +002212025031716440010747629505076318208 +002212025031717285310747640802701565952 +002212025031717450210747644867439321088 +002212025031717571910747647957501530112 +002212025031717573810747648034898472960 +002212025031718064410747650327071215616 +002212025031718102610747651257805398016 +002212025031718212410747654017238462464 +002212025031718354810747657642306998272 +002212025031718373110747658072266403840 +002212025031718392210747658538598060032 +002212025031718480410747660727281532928 +002212025031718532310747662068318453760 +002212025031719253910747670188566003712 +002212025031720031610747679651526443008 +002212025031720290010747686130406944768 +002212025031720435010747689863491391488 +002212025031721222410747699569553100800 +002212025031721273210747700858088878080 +002212025031721502710747706627779866624 +002212025031721521010747707057899040768 +002212025031722014610747709475687288832 +002212025031723054510747725576687595520 +002212025031800120210747742256410423296 +002212025031804265710747806408281714688 +002212025031804313910747807590866276352 +002212025031807051210747846235152445440 +002212025031816245210747987080291639296 +002212025031818221210748016606155997184 +002212025031818401910748021167818158080 +002212025031818492910748023471355805696 +002212025031819123610748029288353943552 +002212025031819310610748033944060411904 +002212025031820005210748041435563143168 +002212025031820170610748045524240707584 +002212025031820175310748045718247174144 +002212025031820293110748048645652299776 +002212025031820455210748052761829982208 +002212025031821001410748056377679032320 +002212025031822104610748074126310129664 +002212025031822312410748079319605891072 +002212025031822352610748080334052839424 +002212025031822403810748081642518691840 +002212025031900130610748104911838789632 +002212025031900313710748109574567899136 +002212025031903201110748151995103690752 +002212025031905160710748181170052489216 +002212025031911430010748278530895847424 +002212025031912035510748283797737906176 +002212025031912440110748293886328483840 +002212025031913114510748300867734843392 +002212025031913343110748306597903851520 +002212025031914590710748327884951883777 +002212025031917420410748368894130479104 +002212025031918070410748375185998729216 +002212025031918215410748378920212066304 +002212025031918521010748386535766417408 +002212025031918571710748387825114402816 +002212025031919034510748389451525734400 +002212025031919090310748390784194666496 +002212025031919172010748392868299640832 +002212025031919183610748393186689257472 +002212025031919355710748397553982992384 +002212025031919410910748398865017458688 +002212025031920474910748415640915238912 +002212025031920573110748418082842841088 +002212025031921212310748424088714981376 +002212025031921291710748426074184212480 +002212025031922245110748440058661679104 +002212025031922252210748440190244974592 +002212025031923001710748448975001202688 +002212025031923224910748454648722579456 +002212025032000465210748475798248460288 +002212025032002241610748500311330086912 +002212025032008033510748585702092795904 +002212025032008510310748597648953675776 +002212025032009162110748604015488626688 +002212025032012292710748652610368540672 +002212025032014220910748680973502427136 +002212025032015171610748694844410613760 +002212025032017383710748730415180931072 +002212025032017553410748734679830970368 +002212025032018065210748737522434019328 +002212025032018185810748740570479038464 +002212025032018223010748741456411414528 +002212025032018482010748747960717221888 +002212025032018505710748748616433754112 +002212025032018560610748749913907191808 +002212025032019224010748756600936390656 +002212025032019313110748758824809443328 +002212025032019320210748758956209524736 +002212025032019413110748761341794021376 +002212025032020251510748772350241726464 +002212025032020460610748777595026874368 +002212025032021012910748781469375848448 +002212025032021153910748785033524899840 +002212025032021210110748786382887809024 +002212025032022415910748806757454893056 +002212025032100140310748829929292926976 +002212025032108042910748948317365309440 +002212025032108160010748951216941424640 +002212025032109105510748965034416619520 +002212025032112324010749015806862667776 +002212025032115331010749061230704029696 +002212025032116380210749077555233918976 +002212025032117111910749085929935396864 +002212025032117305810749090875842830336 +002212025032117433110749094034498379776 +002212025032117474510749095102341943296 +002212025032118140310749101721050124288 +002212025032118150810749101993767395328 +002212025032118271910749105056299855872 +002212025032118415110749108716437073920 +002212025032118584110749112952893284352 +002212025032119040110749114292654522368 +002212025032119065310749115016173416448 +002212025032119213710749118721098747904 +002212025032119285510749120558258180096 +002212025032119452610749124715790962688 +002212025032119473810749125268784013312 +002212025032119571910749127707383746560 +002212025032120413110749138830613639168 +002212025032120534010749141887809671168 +002212025032121445010749154762786435072 +002212025032122161810749162684424097792 +002212025032122311210749166435016302592 +002212025032200465910749200602544975872 +002212025032200522410749201968720338944 +002212025032206575210749293938247176192 +002212025032208370310749318901857226752 +002212025032210055510749341265206431744 +002212025032210361510749348899934425088 +002212025032210372310749349184425156608 +002212025032212254010749376433443139584 +002212025032212365710749379272155160576 +002212025032212422910749380665273470976 +002212025032215321110749423373639733248 +002212025032217271110749452314153029632 +002212025032217392110749455375209160704 +002212025032218085910749462830628253696 +002212025032219003210749475806288879616 +002212025032219274510749482654897983488 +002212025032219464710749487445847928832 +002212025032219484310749487930840756224 +002212025032220105110749493499352129536 +002212025032220185110749495513940725760 +002212025032220354110749499751548510208 +002212025032220490610749503127248269312 +002212025032220503510749503498335531008 +002212025032220531110749504154851418112 +002212025032221004410749506053585219584 +002212025032221084410749508069031907328 +002212025032221134610749509332792233984 +002212025032222470110749532802134093824 +002212025032222530210749534316328103936 +002212025032223115510749539069560590336 +002212025032223484610749548341266714624 +002212025032309454510749698575652450304 +002212025032310064310749703852172029952 +002212025032310424310749712914589511680 +002212025032312161810749736462187204608 +002212025032313130910749750768956125184 +002212025032313563010749761682270556160 +002212025032314235710749768587230142464 +002212025032314533910749776061588922368 +002212025032315172110749782029031272448 +002212025032318005510749823189022068736 +002212025032318533410749836441463906304 +002212025032319041310749839118433751040 +002212025032319071310749839873201115136 +002212025032319342910749846735256530944 +002212025032319411510749848440464396288 +002212025032320122910749856299026714624 +002212025032320361310749862274052747264 +002212025032320531110749866541773299712 +002212025032321093710749870678003511296 +002212025032321130010749871530651148288 +002212025032321185110749873001697591296 +002212025032321304210749875983172575232 +002212025032321574110749882775627345920 +002212025032322162910749887504975630336 +002212025032322533310749896834259070976 +002212025032323122810749901596051206144 +002212025032400010910749913845045747712 +002212025032403030310749959623354585088 +002212025032406285210750011419037249536 +002212025032406312610750012063409692672 +002212025032412254510750101228546134016 +002212025032416493410750167621388824576 +002212025032417135410750173744044392448 +002212025032417531610750183654478761984 +002212025032418024710750186046795116544 +002212025032418185010750190087913431040 +002212025032418225410750191111348772864 +002212025032418484310750197606838415360 +002212025032418493810750197836156067840 +002212025032419145210750204188794380288 +002212025032419150110750204226649182208 +002212025032419182110750205062381613056 +002212025032420081510750217620432044032 +002212025032420144210750219243317452800 +002212025032420325410750223824647188480 +002212025032420451810750226944662626304 +002212025032420483910750227790178332672 +002212025032420501010750228168935305216 +002212025032421031410750231457438339072 +002212025032421171610750234989795811328 +002212025032422332210750254141702238208 +002212025032423002110750260931982512128 +002212025032500173910750280387799994368 +002212025032500271610750282806994849792 +002212025032508161710750400838017724416 +002212025032508304910750404496271032320 +002212025032515150810750506243367624704 +002212025032515365510750511725453742080 +002212025032516011410750517847673630720 +002212025032516035410750518518609010688 +002212025032516140010750521059709276160 +002212025032517252010750539009160732672 +002212025032517324710750540884473114624 +002212025032518360410750556809666727936 +002212025032518502010750560402942287872 +002212025032518533010750561196696064000 +002212025032519512510750575772808433664 +002212025032520041310750578995962359808 +002212025032520471710750589834546630656 +002212025032521023310750593673235357696 +002212025032521135810750596546779402240 +002212025032521294510750600519708037120 +002212025032522125310750611374034219008 +002212025032522240410750614188951937024 +002212025032522262410750614775557971968 +002212025032522344210750616864210792448 +002212025032523160410750627274945536000 +002212025032523173610750627661209186304 +002212025032523382710750632910236934144 +002212025032603584510750698417295409152 +002212025032608385610750768924931633152 +002212025032611515910750817510155333632 +002212025032612121710750822615970664448 +002212025032617474110750907022248226816 +002212025032617523810750908270258671616 +002212025032618085510750912366156427264 +002212025032618231510750915975237578752 +002212025032618514510750923146750423040 +002212025032619394510750935225030332416 +002212025032620002110750940411644841984 +002212025032620440710750951422520815616 +002212025032620502210750952996404031488 +002212025032620580910750954957399080960 +002212025032621314310750963404431134720 +002212025032621415310750965962866089984 +002212025032621464910750967205064556544 +002212025032622184210750975226804932608 +002212025032622275410750977541119127552 +002212025032623395710750995673594441728 +002212025032702502410751043603868913664 +002212025032710495210751164264905797632 +002212025032710500710751164328769671168 +002212025032713490010751209346384506880 +002212025032713500310751209609546686464 +002212025032713541010751210642685480960 +002212025032714404610751222370870157312 +002212025032716202410751247446004916224 +002212025032717055710751258907725864960 +002212025032718160010751276538037768192 +002212025032718361810751281647450820608 +002212025032718363610751281722986422272 +002212025032718394610751282519066636288 +002212025032719010210751287869467619328 +002212025032719111610751290445227929600 +002212025032719112710751290491835035648 +002212025032719430610751298457571377152 +002212025032720362710751311883245547520 +002212025032720455010751314245607055360 +002212025032720471210751314589011484672 +002212025032721303310751325495279456256 +002212025032721351110751326663473176576 +002212025032722074310751334851148849152 +002212025032722102410751335524349956096 +002212025032722204210751338115865075712 +002212025032722262810751339568667811840 +002212025032722282710751340066515685376 +002212025032723014210751348434087415808 +002212025032801531010751391586981695488 +002212025032803422310751419072330043392 +002212025032804100310751426033494511616 +002212025032808005310751484124974010368 +002212025032808242410751490042637152256 +002212025032809165210751503248802951169 +002212025032810052010751515442743652352 +002212025032812251210751550645029138432 +002212025032812255710751550830824222720 +002212025032812312710751552218064318464 +002212025032812460110751555883650605056 +002212025032813385510751569194295304192 +002212025032815221810751595209986502656 +002212025032815431910751600501138202624 +002212025032816493610751617180884103168 +002212025032817515410751632860645613568 +002212025032817540810751633422652989440 +002212025032818153510751638820485836800 +002212025032818262710751641555527524352 +002212025032818283910751642107460808704 +002212025032818581510751649555739406336 +002212025032819081810751652086326726656 +002212025032819094610751652454489903104 +002212025032819121210751653067797917696 +002212025032819155810751654014729629696 +002212025032819261710751656610566336512 +002212025032819283910751657208624951296 +002212025032820065910751666855641182208 +002212025032820092410751667463033667584 +002212025032820410710751675444586393600 +002212025032820481110751677224383508480 +002212025032820533610751678586445316096 +002212025032820541210751678736917835776 +002212025032821052610751681563034640384 +002212025032821114910751683171301122048 +002212025032821440410751691286326726656 +002212025032822050410751696570412908544 +002212025032822521810751708458643976192 +002212025032823034510751711340086874112 +002212025032823045510751711634998784000 +002212025032823311610751718263760711680 +002212025032823371010751719749147762688 +002212025032903074010751772724233424896 +002212025032909383510751871101991358464 +002212025032909582710751876101788110848 +002212025032910330110751884798752952320 +002212025032912474910751918723754311680 002212025032915142210751955601597734912 +002212025032917021910751982771875057664 +002212025032917113910751985116857733120 +002212025032917250010751988478693388288 +002212025032917504910751994977188147200 +002212025032918014310751997716826513408 +002212025032918170910752001603586985984 +002212025032918284210752004509052669952 002212025032919093310752014787236806656 +002212025032919264910752019136122548224 +002212025032919544710752026173722251264 002212025032920030110752028244699078656 002212025032920285610752034766063448064 +002212025032920500410752040085679693824 002212025032921074210752044521727410176 002212025032921283110752049762299731968 002212025032922102310752060299081920512 +002212025032923032610752073648546439168 002212025032923135510752076287633514496 002212025032923211210752078119734157312 002212025033000474110752099882703876096 @@ -30,5 +805,30 @@ 002212025033017583110752359300771319808 002212025033018144810752363397305954304 002212025033018543710752373420931891200 +002212025033019252510752381171574337536 002212025033019321710752382899547893760 +002212025033019422210752385433715531776 +002212025033019504910752387564235894784 +002212025033021112310752407837993000960 002212025033021190810752409787475611648 +002212025033021340810752413563265032192 +002212025033022101610752422656283955200 +002212025033022110010752422841707208704 +002212025033022130510752423363743571968 +002212025033023540510752448782209835008 +002212025033100114610752453231485575168 +002212025033108350310752579886561435648 +002212025033108562410752585261125820416 +002212025033109495710752598738047119360 +002212025033117464510752718728628367360 +002212025033118110210752724837602922496 +002212025033118422610752732741928464384 +002212025033118464310752733818026450944 +002212025033119015610752737649296662528 +002212025033119021310752737718688264192 +002212025033119304310752744890395447296 +002212025033120110810752755062083776512 +002212025033120120210752755290479861760 +002212025033120383810752761981837598720 +002212025033120390910752762114244702208 +002212025033120434810752763283883397120 diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index df69ced33..9b36f6f51 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -811,15 +811,15 @@ public class AdapayService { throw new BusinessException(ReturnCodeEnum.CODE_ADAPAY_MEMBER_IS_NULL_ERROR); } - // 提现金额为昨日金额 - BigDecimal lastAvlBalance = adapayAccountBalanceVO.getLastAvlBalance(); + // 提现金额为昨日金额 withdrawalAmount + BigDecimal withdrawalAmount = adapayAccountBalanceVO.getLastAvlBalance(); // 提现手续费 每笔固定5元 2025年2月13日11点47分手续费改为参数传入 // BigDecimal feeAmt = new BigDecimal("5"); BigDecimal feeAmt = new BigDecimal(dto.getFeeAmt()); // 实际提现到账金额 - BigDecimal cashAmt = lastAvlBalance.subtract(feeAmt); + BigDecimal cashAmt = withdrawalAmount.subtract(feeAmt); // 可提现金额减去手续费后需大于0 if (cashAmt.compareTo(BigDecimal.ZERO) <= 0) { @@ -859,7 +859,7 @@ public class AdapayService { record.setWithdrawCode(id); record.setOrderNo(orderNo); record.setWithdrawStatus(Constants.ZERO); - record.setWithdrawAmt(adapayAccountBalanceVO.getAvlBalance()); // 申请提现金额 + record.setWithdrawAmt(withdrawalAmount); // 申请提现金额 record.setFeeAmt(feeAmt); // 提现手续费 record.setCreditedAmt(cashAmt); // 到账金额 Date now = new Date();