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 a4272634c..70b010f55 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 @@ -232,7 +232,7 @@ public class TempController extends BaseController { } /** - * 临时接口，计算站点订单报表 + * 临时接口，计算站点订单报表, 重新计算SettleOrderReport * http://localhost:8080/temp/tempGenerateDailyOrderReports * * @param dto diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index 343d39fa0..10e3e613d 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,77 +1,471 @@ -002212024090914192210679101803152797696 -002212024090914333310679105371582320640 -002212024091009514410679396837268226048 -002212024091115233610679842742632013824 -002212024091117122610679870130970525696 -002212024091209591810680123515480293376 -002212024091210151610680127534423285760 -002212024091212065710680155642674528256 -002212024091309354310680479969644072960 -002212024091311125410680504425742057472 -002212024091313394910680541399592423424 -002212024091313560510680545493976383488 -002212024091316232410680582568617385984 -002212024091412373610680888129932328960 -002212024091414505710680921688965812224 -002212024091415461310680935597961334784 -002212024091421432810681025500458135552 -002212024091509541710681209418854203392 -002212024091515502310681299034555170816 -002212024091609063010681559781566349312 -002212024091710295110681943146169663488 -002212024091714040610681997062227054592 -002212024091714342710682004701600428032 -002212024091810350210682306834994466816 -002212024091814443010682369616134971392 -002212024091911104110682678197676363776 -002212024091915323410682744102824857600 -002212024092009535710683021275046903808 -002212024092013044210683069278250184704 -002212024092013404310683078340267429888 -002212024092115555810683474764473192448 -002212024092116071310683477595072380928 -002212024092212562210683791954410979328 -002212024092216530010683851507236323328 -002212024092218314510683876359749668864 -002212024092218322310683876516924137472 -002212024092306572310684064001316204544 -002212024092310471510684121850121662464 -002212024092311022310684125658272116736 -002212024092312371410684149526990827520 -002212024092313041410684156325092540416 -002212024092313133110684158659137589248 -002212024092314532410684183796668342272 -002212024092316270810684207386386440192 -002212024092408453310684453612216483840 -002212024092412541810684516213190705152 -002212024092413084710684519858243252224 -002212024092416002510684563050650763264 -002212024092417193310684582964149587968 -002212024092500102310684686355347783680 -002212024092509585810684834476088717312 -002212024092513241810684886147877879808 -002212024092514363210684904328798638080 -002212024092516071710684927166924124160 -002212024092518523710684968773814677504 -002212024092519544910684984424548884480 -002212024092614013110685257902825074688 -002212024092616390710685297564188864512 -002212024092711304110685582333862608896 -002212024092713260410685611368844570624 -002212024092713511410685617704500146176 -002212024092716153510685654031453437952 -002212024092820034810686073851451183104 -002212024092907005910686239234404093952 -002212024092909590010686284033765195776 -002212024092911200510686304441224900608 -002212024092911440610686310484299726848 -002212024092913003610686329734903009280 -002212024092914011910686345016510754816 -002212024092914013110686345065220521984 -002212024092916191010686379707636027392 -002212024093006552810686600233475682304 -002212024093012394910686686893417926656 -002212024093013551710686705887160655872 -002212024093016184710686742000076718080 -002212024093016193010686742178873982976 -002212024093020113510686800585400750080 \ No newline at end of file +002212025010723102710722721995788619776 +002212025012309120910728309237576761344 +002212025011616275510725882185743962112 +002212025010821034310723052492650369024 +002212025011311020910724713040045907968 +002212025010408521410721418855848980480 +002212025012012434610727275329040863232 +002212025012415420510728769755156672512 +002212025012419540110728833154596474880 +002212025011114583810724047778789306368 +002212025010211464610720738001669509120 +002212025010812312510722923565088624640 +002212025011018241210723737122879275010 +002212025010808295810722862802163453952 +002212025011815570910726599221390057472 +002212025012615062710729485562960584704 +002212025012319213710728462613550821376 +002212025011411493710725087372428427264 +002212025011616570410725889523774160896 +002212025011307230810724657922396098560 +002212025011109365510723966813725499392 +002212025011813322310726562788340387840 +002212025010419430910721582666085273600 +002212025011118513210724106391360745472 +002212025012514510310729119301834252288 +002212025012308284310728298306676535296 +002212025010812173510722920085762977792 +002212025010310450410721084862279028736 +002212025011712422410726187819189903360 +002212025011309122510724685424329986048 +002212025011707390410726111484978909184 +002212025011308283310724674384720871424 +002212025011819120910726648293160898560 +002212025012019592710727384973207654400 +002212025010521134610721967857036087296 +002212025011308284610724674440790913024 +002212025012620563010729573656528916480 +002212025011721375610726322594085441536 +002212025012214345010728028053643030528 +002212025011308355110724676222380240896 +002212025010513304610721851337231798272 +002212025011502070210725303149779062784 +002212025010711343210722546862787907584 +002212025010817252510722997554836393984 +002212025010302205410720957987176173568 +002212025011519163210725562231870033920 +002212025011120144710724127340456026112 +002212025012611282110729430675825455104 +002212025010910232710723253749650079744 +002212025010720325410722682349370060800 +002212025011509293110725414505886765056 +002212025012413153410728732883888021504 +002212025010308535910721056908464992256 +002212025012117015910727702699124551680 +002212025010209350010720704841933361152 +002212025012119531410727745793802764288 +002212025010116040910720440385382109184 +002212025013020125410731012235516051456 +002212025010714423810722594198844526592 +002212025012708135210729744121599729664 +002212025011919412110727018030565257216 +002212025010208230510720686744396939264 +002212025012719282310729913869969485824 +002212025012209424110727954533627015168 +002212025011016535010723714380268339200 +002212025012111482710727623797127344128 +002212025012009442210727230179265974272 +002212025010722062910722705898344378368 +002212025012109301510727589015620395008 +002212025011514554610725496609613271040 +002212025010317121810721182313922539520 +002212025011205361410724268632025567232 +002212025011314320510724765873620369408 +002212025010721465510722700973046222848 +002212025011310560910724711532961566720 +002212025011408332610725038002185023488 +002212025012011215710727254739174850560 +002212025011312103610724730267448098816 +002212025012209404610727954051867713536 +002212025010708585210722507690630959104 +002212025010316001010721164161536278528 +002212025011708414210726127248911749120 +002212025011007372510723574353139826688 +002212025010116261210720445936162541568 +002212025010914090110723310516902809600 +002212025010315110510721151807751114752 +002212025012012075610727266311645151232 +002212025012220343210728118577720430592 +002212025010209250410720702342575194112 +002212025011113352610724026840422514688 +002212025011212213710724370650857050112 +002212025011119392610724118445064241152 +002212025011818054110726631566903054336 +002212025010617220110722271923645820928 +002212025011312074210724729536527712256 +002212025012619541510729557989070565376 +002212025010521532810721977848664395776 +002212025012222415210728150619257925632 +002212025012118585110727732109867393024 +002212025012110295210727604020899188736 +002212025011808082910726481275361349632 +002212025011610083810725786738199203840 +002212025011806520110726462031187378176 +002212025011013590710723670410631426048 +002212025011116065210724064950604500992 +002212025012115224110727677708808040448 +002212025011716184710726242276524134400 +002212025010417053610721543014120263680 +002212025011621565610725964984531406848 +002212025010112160010720382971649306624 +002212025010716343810722622387024531456 +002212025010311085010721090842950750208 +002212025011616125310725878404457156608 +002212025011108253810723948877630898176 +002212025012118342310727725950202638336 +002212025012513142610729094987267530752 +002212025012415045010728760379478003712 +002212025010908315810723225696645136384 +002212025013023024610731054982091595776 +002212025010610150210722164468963573760 +002212025010917495510723366108427808768 +002212025011313204110724747902797725696 +002212025012409094710728671031210147840 +002212025012419180910728824128910794752 +002212025010915440610723334444830011392 +002212025012711442710729797116123828224 +002212025012108083410727568460898226176 +002212025011511590410725452141441150976 +002212025011712410410726187486015639552 +002212025012408523610728666707146805248 +002212025010708122610722496004758675456 +002212025010622485210722354177990553600 +002212025011719381410726292470868307968 +002212025010719073810722660888561557504 +002212025011115294310724055601510010880 +002212025010917363110723362733391450112 +002212025011401002710724924004842590208 +002212025010915030210723324111045906432 +002212025010320511010721237394423926784 +002212025010209324910720704294037979136 +002212025011222100010724518724524404736 +002212025010613280310722213041670041600 +002212025010213064110720758116374265856 +002212025010315341410721157636254105600 +002212025011008354810723589046720622592 +002212025012519223610729187637686304768 +002212025010618165210722285726758064128 +002212025012410554010728697674472710144 +002212025010809101610722872945000284160 +002212025011315064210724774583957692416 +002212025011609461910725781119812947968 +002212025012620392510729569357420134400 +002212025011612281610725821878347943936 +002212025010712195010722558265430364160 +002212025011708333710726125213252956160 +002212025010512432910721839439798050816 +002212025012107510410727564055725592576 +002212025011118132310724096788509609984 +002212025010413062610721482828256104448 +002212025011520270410725579984122183680 +002212025011719194010726287798591541248 +002212025011012050910723641729856557056 +002212025012309285110728313439386697728 +002212025012512455610729087815005986816 +002212025011917251510726983776802414592 +002212025011812365410726548826983731200 +002212025011518034710725543924681981952 +002212025010309055910721059927129821184 +002212025010509025310721783923579265024 +002212025011118040610724094451120459776 +002212025010208324210720689162884972544 +002212025013112421410731261210105974784 +002212025011518251710725549335691055104 +002212025012015393810727319585196838912 +002212025012221480610728137088802316288 +002212025010912133910723281482415308800 +002212025010414472710721508248652857344 +002212025013108405410731200477688573952 +002212025011708395310726126790485839872 +002212025012318345410728450859607744512 +002212025010208325510720689218841464832 +002212025011310081110724699460958801920 +002212025011321481510724875635681181696 +002212025010318280610721201389178953728 +002212025011417373310725174936155181056 +002212025010522154910721983471963983872 +002212025011208343310724313507843788800 +002212025010112445010720390228878786560 +002212025010709103010722510615496069120 +002212025010614265610722227861644869632 +002212025011910345210726880500202323968 +002212025013117210610731331388234178560 +002212025011713202810726197400042442752 +002212025011913543210726930748132544512 +002212025010708290510722500192491585536 +002212025011213315210724388332260790272 +002212025011614122510725848088180535296 +002212025011717320010726260703536467968 +002212025011021455210723787872766775296 +002212025012008232510727209809993842688 +002212025011809290210726501547436638208 +002212025011218205710724461079561211904 +002212025012813195110730183514438733824 +002212025011916551510726976226693464064 +002212025011408580410725044201872920576 +002212025011017111610723718767746207744 +002212025012715022010729846914936610816 +002212025010319364210721218654550978560 +002212025010913345710723301942110834688 +002212025012108392110727576207720693760 +002212025010812102210722918270156132352 +002212025011115343110724056808818708480 +002212025012211045710727975234630983680 +002212025011713404910726202522623524864 +002212025012916482310730598377426739200 +002212025011908513710726854516609495040 +002212025011615072410725861925794840576 +002212025010708413210722503328496078848 +002212025012012331310727272675495084032 +002212025010308424910721054096347549696 +002212025010209045910720697286822572032 +002212025011709253610726138293870641152 +002212025013116211010731316306862223360 +002212025010318155810721198333967433728 +002212025011215393710724420480090230784 +002212025012117562010727716377408176128 +002212025012012011410727264623344144384 +002212025012411541610728712424921325568 +002212025011607542410725752956777058304 +002212025012220210410728115186577801216 +002212025012919354210730640487394406400 +002212025012714345210729840001899651072 +002212025010311583410721103359613308928 +002212025010907400410723212633884827648 +002212025011508242510725398122942414848 +002212025012309500210728318771544326144 +002212025010115411510720434622909214720 +002212025011000502110723471914797662208 +002212025012312514410728364496369451008 +002212025012309300610728313753157210112 +002212025011409081510725046764148994048 +002212025010714541910722597139118411776 +002212025012107371710727560586370990080 +002212025010710585510722537899278237696 +002212025010123560110720559135302062080 +002212025012415191610728764014688563200 +002212025011113314410724025910598225920 +002212025011208453010724316263958695936 +002212025011113460110724029503169089536 +002212025011108524310723955693939183616 +002212025012617164110729518337283035136 +002212025012608404110729388482604658688 +002212025010807304410722847897462099968 +002212025012417015410728789841778278400 +002212025010514453810721870177907691520 +002212025011512564910725466674554716160 +002212025011421333710725234344004132864 +002212025010608313910722138453078364160 +002212025011213402110724390465743196160 +002212025010611091710722178121064960000 +002212025010409245010721427060309671936 +002212025010616301910722258911482073088 +002212025012413343510728737669594587136 +002212025012213462510728015869489143808 +002212025011508025810725392722076995584 +002212025012118203110727722461489680384 +002212025013108131310731193510834298880 +002212025010215515110720799681147011072 +002212025010601295310722032308975878144 +002212025010707385910722487583390937088 +002212025012223004110728155357721493504 +002212025012617303710729521844354519040 +002212025011314215010724763294836752384 +002212025012612194910729443630837215232 +002212025010519165810721938461572976640 +002212025010912340510723286625719521280 +002212025011920344910727031483282067456 +002212025011008532110723593464607703040 +002212025010313283210721125999265685504 +002212025011613151210725833688201797632 +002212025012212134610727992553370030080 +002212025010409320110721428868489793536 +002212025011806364710726458200665591808 +002212025012317203310728432147504828416 +002212025012509181710729035554497728512 +002212025013118253610731347620166598656 +002212025011109050410723958801390465024 +002212025011718190710726272558736314368 +002212025011108484210723954681476640768 +002212025011308375710724676751975546880 +002212025010907541410723216197066915840 +002212025012220365810728119190175186944 +002212025011912265410726908697390731264 +002212025010909001910723232829655719936 +002212025010509504410721795963925942272 +002212025010413364310721490447420932096 +002212025011309473310724694268745584640 +002212025010411581710721465677537050624 +002212025010212482210720753505423699968 +002212025012017304010727347531035815936 +002212025010812322210722923803643858944 +002212025011422430210725251810433404928 +002212025012415433010728770109761347584 +002212025012217195310728069590300884992 +002212025013121253110731392896554205184 +002212025010408204510721410933592870912 +002212025011020285410723768503116869632 +002212025011110081010723974677871120384 +002212025010317183810721183906850394112 +002212025013014583010730933115161772032 +002212025010920283710723406046158311424 +002212025011012575610723655017170325504 +002212025012619583910729559097894596608 +002212025012013020310727279928258039808 +002212025011509485510725419387485126656 +002212025010715312410722606471518855168 +002212025012715573210729860808572030976 +002212025011711551410726175949499711488 +002212025011015464110723697483839819776 +002212025012108375010727575824848375808 +002212025011313481610724754846107598848 +002212025010320273910721231477127749632 +002212025010609104110722148273703059456 +002212025011416484010725162632616067072 +002212025011422135810725244495581921280 +002212025010914372110723317646852206592 +002212025010118513210720482512583094272 +002212025010811505310722913367157362688 +002212025011818005210726630354829799424 +002212025010816592210722990998923431936 +002212025012308113210728293982964256768 +002212025011608525110725767667027636224 +002212025011018225110723736783529103360 +002212025010420451210721598278385778688 +002212025012612382710729448319778926592 +002212025010315530410721162373499949056 +002212025011119163510724112694902759424 +002212025011409121010725047752090554368 +002212025012309415010728316709269626880 +002212025011312480210724739686563348480 +002212025012914075210730557982972284928 +002212025011909365510726865920598593536 +002212025012608464010729389987064033280 +002212025010108504510720331320832397312 +002212025011911280610726893900677488640 +002212025012112141410727630283798265856 +002212025012209324710727952041505689600 +002212025010218541110720845566318055424 +002212025011013592010723670468984012800 +002212025010908130610723220945209966592 +002212025011023302710723814194305859584 +002212025011615471310725871945823272960 +002212025013021144010731027779126038528 +002212025011408095310725032078178897920 +002212025011410434310725070791000838144 +002212025011408333610725038046047358976 +002212025010613181510722210578247680000 +002212025010608275710722137520980086784 +002212025011014545410723684450868428800 +002212025011619320710725928540269678592 +002212025010704423710722443199876407296 +002212025011212425710724376018386669568 +002212025010819492510723033791392096256 +002212025010508363510721777303423008768 +002212025011518545010725556773370818560 +002212025010519431310721945070191558656 +002212025010908275210723224663018676224 +002212025012612083110729440786292764672 +002212025012608331210729386599233622016 +002212025010810372010722894857754226688 +002212025010810252610722891859624968192 +002212025011007581610723579602414125056 +002212025010108300710720326127439806464 +002212025011519471410725569958748450816 +002212025010518410510721929430716088320 +002212025012709311710729763603882332160 +002212025012408284510728660703945011200 +002212025010213471510720768323418882048 +002212025011321400710724873589429075968 +002212025012215065810728036141783674880 +002212025011212274310724372185101479936 +002212025010704270310722439282202804224 +002212025010208353710720689899813781504 +002212025011708045710726117999516827648 +002212025012212544210728002854703947776 +002212025010818094110723008691947151360 +002212025012214383010728028977685438464 +002212025011908301410726849137332158464 +002212025011619363010725929644713807872 +002212025011021514010723789332428992512 +002212025011620370010725944868340744192 +002212025011903113910726768964872142848 +002212025012212210410727994391144402944 +002212025012211460410727985582912401408 +002212024123122462610720179239087091712 +002212025010212322810720749504761401344 +002212025011519210210725563364146135041 +002212025012617364110729523371217215488 +002212025010614124810722224305072275456 +002212025010517443710721915222602133504 +002212025010208061710720682517539835904 +002212025012109225810727587183678431232 +002212025011915322210726955369407827968 +002212025011908353210726850469605068800 +002212025012609560310729407448555286528 +002212025012508273210729022785207635968 +002212025011509481910725419235999203328 +002212025012610510210729421286177476608 +002212025011021002110723776418203799552 +002212025011918280810726999605643825152 +002212025011215062110724412109894950912 +002212025011210010210724335271390203904 +002212025011109234210723963489550835712 +002212025010219172510720851412371623936 +002212025012114183110727661563080052736 +002212025010908434110723228644591259648 +002212025012315130610728400072113790976 +002212025012517371810729161136253145088 +002212025012308025010728291795173220352 +002212025012616444410729510298288467968 +002212025010417541810721555272057475072 +002212025011715571510726236856550674432 +002212025011812123710726542715596820480 +002212025011009033910723596055690334208 +002212025012409133210728671974716301312 +002212025011420082910725212918195146752 +002212025010114031610720409965794660352 +002212025013116124310731314179327754240 +002212025011018120810723734087633190912 +002212025010714330110722591778555129856 +002212025012220184110728114587193913344 +002212025011008435710723591099252707328 +002212025011514064510725484271846268928 +002212025012008584410727218699290509312 +002212025011418484410725192846896099328 +002212025012315364610728406027592114176 +002212025012419154710728823535744135168 +002212025010709203410722513149353250816 +002212025011217002710724440822618750976 +002212025010815540810722974579865931776 +002212025010813532010722944181074182144 +002212025010809153510722874281289043968 +002212025010608202110722135609771528192 +002212025011913542310726930711694897152 +002212025013108283610731197379419123712 +002212025012915490310730583446282907648 +002212025011010034810723611192563056640 +002212025012108344010727575026800447488 +002212025012108304510727574043212365824 +002212025011000032610723460107462803456 +002212025010314052710721135289812111360 +002212025010908133510723221069340463104 +002212025010913411010723303506082500608 +002212025011016301110723708428066197504 +002212025011710473910726158944592121856 +002212025011911084310726889021233418240 +002212025012714013410729831623758974976 +002212025012508314610729023851991109632 +002212025010512482810721840692612943872 +002212025010417060410721543134907441152 +002212025012609095010729395818705543168 +002212025010417184410721546319968894976 +002212025011314013310724758188879495168 +002212025011615454710725871583062360064 +002212025010308111410721046151248056320 +002212025011419102510725198303389007872 +002212025010308281710721050442032201728 +002212025010408432010721416617164197888 +002212025010209452110720707447533830144 +002212025012714511310729844116926070784 +002212025012410311410728691528142782464 \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index e501a2001..88d6f5851 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -684,7 +684,13 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { : new BigDecimal(vo.getChargingDegree()); // 统计用电度数大于0的订单, 2025年1月14日16点00分修改 - if (chargingDegree.compareTo(BigDecimal.ZERO) <= 0) { + // if (chargingDegree.compareTo(BigDecimal.ZERO) <= 0) { + // // 只统计用电量大于0的 + // continue; + // } + + // 统计结算和用电度数都为0, 不统计 + if (chargingDegree.compareTo(BigDecimal.ZERO) <= 0 && settleAmount.compareTo(BigDecimal.ZERO) <= 0) { // 只统计用电量大于0的 continue; }