Merge remote-tracking branch 'origin/dev' into dev-zzx

2026-04-20 02:55:04 +08:00 · 2025-07-11 16:46:01 +08:00
parent a84f9de038 95bdfd9916
commit 1c9430c0ef
2 changed files with 286 additions and 27 deletions
--- a/jsowell-admin/src/test/resources/payment_ids
+++ b/jsowell-admin/src/test/resources/payment_ids
@@ -1,8 +1,270 @@
-002212025060720331010777402983251783680
-002212025060721472610777421673882566656
-002212025060722130110777428110714519552
-002212025060809010010777591179259432960
-002212025060810011610777606348080578560
-002212025060810202610777611170066636800
-002212025060812480710777648338462162944
-002212025060815192710777686420418621440
+002212025010312233010721109634712432640
+002212025010511395410721823438163660800
+002212025010618280110722288531017486336
+002212025010715335410722607101620756480
+002212025010718002910722643992939560960
+002212025010718012310722644217850478592
+002212025010718060410722645396540407808
+002212025011018205810723736310183727104
+002212025011018321710723739159185690624
+002212025011116210310724068519130157056
+002212025011310420210724707980096671744
+002212025011311441610724723639892930560
+002212025011318154210724822149206626304
+002212025011319030810724834085954048000
+002212025011413331110725113438574858240
+002212025011517524110725541132409995264
+002212025011618112110725908216719314944
+002212025011618190510725910161285685248
+002212025011718382010726277396412993536
+002212025011808442810726490329845841920
+002212025011812071810726541377822244864
+002212025012113235010727647798636810240
+002212025012216571910728063910461665280
+002212025012309061710728307759910051840
+002212025012312233810728357424359510016
+002212025020718224810733883632906772480
+002212025020910081810734483962516905984
+002212025021114333510735275496150630400
+002212025021219400410735715016713003008
+002212025021418451910736426013719355392
+002212025021608242610736994539230171136
+002212025021614104510737081692663672832
+002212025021708153810737354709680492544
+002212025021811523110737771677491879936
+002212025021910103810738108425874923520
+002212025021911361010738129954535469056
+002212025022010082310738470250781085696
+002212025022017423510738584551070339072
+002212025022020015510738619616562741248
+002212025022108292310738807722325008384
+002212025022117430010738947046897709056
+002212025022212362410739232274985259008
+002212025022215034410739269351327539200
+002212025022308152110739528966891261952
+002212025022408221210739893076744863744
+002212025022408224210739893202453405696
+002212025022418473510740050462035120128
+002212025022518032410740401728922726401
+002212025022518440910740411986514296832
+002212025022608255810740618800661000192
+002212025022609001310740627420205645824
+002212025022617395810740758221619281920
+002212025022717415610741121103409590272
+002212025022809444510741363402955288576
+002212025022817365110741482213523939328
+002212025022818552610741501989554241536
+002212025030108314510741707421688844288
+002212025030113170510741779228571783168
+002212025030115311310741812985282310144
+002212025030208023110742062451713982464
+002212025030210101010742094575161815040
+002212025030316140910742548562885455872
+002212025030417384510742932240415080448
+002212025030418282510742944739742969856
+002212025030515141410743258261610835968
+002212025030518552010743313902547251200
+002212025030518563310743314208083447808
+002212025030615342210743625715060289536
+002212025030618403610743672584841736192
+002212025030717350810744018496464969728
+002212025030813225510744317411919749120
+002212025030908263910744605241428914176
+002212025031008194710744965899169443840
+002212025031017390610745106656476565504
+002212025031115013910745429419838926848
+002212025031118193010745479211732840448
+002212025031218323710745844899212578816
+002212025031308355010746057104936980480
+002212025031309071910746065026482257920
+002212025031317464310746195736192667648
+002212025031508272110746779744416055296
+002212025031511055310746819641957953536
+002212025031513005510746848590964248576
+002212025031513042010746849447662600192
+002212025031609123410747153510681800704
+002212025031813023710747936182459748352
+002212025031817403010748006111407648768
+002212025031909372410748246923995394048
+002212025031916141110748346776630018048
+002212025032010331310748623357191434240
+002212025032017383410748730402749640704
+002212025032018320810748743881261289472
+002212025032113522310749035869626789888
+002212025032117555410749097153108037632
+002212025032210515810749352851345055744
+002212025032212030110749370734091386880
+002212025032310181310749706749476524032
+002212025032312122810749735499925786624
+002212025032517481310750544768694960128
+002212025032618063710750911787057328128
+002212025032713435210751208054068596736
+002212025032717563510751271652772896768
+002212025032721215910751323340967845888
+002212025032806273310751460636267737088
+002212025032909590410751876255525990400
+002212025032915011410751952300168658944
+002212025032916281410751974192431329280
+002212025033008261910752215304013320192
+002212025033118021810752722640020103168
+002212025033119450310752748499328290816
+002212025033119575710752751744599027712
+002212025040117325310753077626790789120
+002212025040210284610753333282284224512
+002212025040210333610753334495618420736
+002212025040210412410753336461826359296
+002212025040210483410753338264797433856
+002212025040217335810753440286187241472
+002212025040219292110753469323218989056
+002212025040312411410753729005884166144
+002212025040317480510753806225146826752
+002212025040317512510753807067348848640
+002212025040411423410754076629982552064
+002212025040508465110754394796462161920
+002212025040608330010754753697578930176
+002212025040717471910755255587231481856
+002212025040908310910755840397767290880
+002212025040916322010755961490079465472
+002212025040920275410756020771788726272
+002212025041011312110756248133497307136
+002212025041208070810756921518777880576
+002212025041408305810757652288682942464
+002212025041417492110757792812764901376
+002212025041508141810758010485145751552
+002212025041513242810758088537941684224
+002212025041513292510758089785893924864
+002212025041708285810758738950629605376
+002212025041715444810758848629766660096
+002212025041718135110758886139545964544
+002212025041818484010759257289566871552
+002212025041909061610759473112839069696
+002212025041915020210759562644875800576
+002212025041915032910759563009752309760
+002212025041918533310759620908063137792
+002212025042008390010759828638282702848
+002212025042117371010760326461189152768
+002212025042210371910760583189709578240
+002212025042212390810760613847324471296
+002212025042216161810760668500097044480
+002212025042217524110760692752278249472
+002212025042317454110761053381239779328
+002212025042518523510761794990252744704
+002212025042608515610762006222775672832
+002212025042609175310762012751844110336
+002212025042609202610762013392594427904
+002212025042609211310762013591531188224
+002212025042609224610762013981311229952
+002212025042609252510762014645440790528
+002212025042710323210762393926702903296
+002212025042711132810762404226109976576
+002212025042711215710762406361371492352
+002212025042718313910762514501142470656
+002212025042911074410763127561645350912
+002212025042911093910763128043013447680
+002212025042912572510763155160903966720
+002212025043013020710763518731867111424
+002212025043015034010763549322996244480
+002212025050618033410765768924140658688
+002212025050708245110765985670659203072
+002212025050714473210766081979332321280
+002212025050714524210766083278920638464
+002212025050912150210766768374820663296
+002212025050913513510766792671450521600
+002212025050917423610766850808739966976
+002212025051015063710767173942789713920
+002212025051108285910767436264674992128
+002212025051211595110767851718841757696
+002212025051220074310767974492804636672
+002212025051317382510768299309969227776
+002212025051320044810768336148596510720
+002212025051408412410768526551529865216
+002212025051418113910768670060587499520
+002212025051420293110768704754705281024
+002212025051711484410769660860241010688
+002212025051715110110769711763870437376
+002212025051716013710769724498383192064
+002212025051808350310769974506976436224
+002212025051919274310770501141468049408
+002212025052009141710770709153968545792
+002212025052018272110770848338087686144
+002212025052317464310771925274990374912
+002212025052408303510772147708867555328
+002212025052508282310772509542127841280
+002212025052608294310772872264091856896
+002212025052608492510772877225203355648
+002212025052611444410772921342750257152
+002212025052810175710773624280070975488
+002212025052810443710773630989890912256
+002212025052811451610773646252271366144
+002212025052813115410773668057356513280
+002212025052817493910773737954751455232
+002212025052909270210773973854057578496
+002212025052916590910774087633092870144
+002212025053013045210774391060426248192
+002212025053015030310774420801913843712
+002212025053015311910774427917047058432
+002212025053015590210774434890648829952
+002212025060211572710775461260357693440
+002212025060315450110775880917645656064
+002212025060413183710776206460583530496
+002212025060417425310776272963961999360
+002212025060619424110777027891996995584
+002212025060708132810777216832941707264
+002212025060808142810777579468792229888
+002212025060812134010777639666656292864
+002212025060912355610778007659949142016
+002212025060914045710778030059458998272
+002212025060918160110778093243819380736
+002212025060918445710778100522723799040
+002212025060920361110778128518575161344
+002212025061017470110778448331703701504
+002212025061218255910779182913943056384
+002212025061219075510779193466884366336
+002212025061317453610779535139644534784
+002212025061410010110779780612443504640
+002212025061415583210779870584995954688
+002212025061417480010779898130494881792
+002212025061508240110780118589981929472
+002212025061617305310780618601641967616
+002212025061708272110780844202413703168
+002212025061708321110780845418258706432
+002212025061713270110780919618405560320
+002212025061716281610780965229756071936
+002212025061718530510781001672502935552
+002212025061808331110781208058550104064
+002212025061811521110781258137657954304
+002212025061817455910781347177186357248
+002212025061818500010781363287814422528
+002212025062012573410781999368443080704
+002212025062017173110782064789755379712
+002212025062017470510782072226553962496
+002212025062211451010782705924662964224
+002212025062413024210783450211964928000
+002212025062418154110783528978758483968
+002212025062519062410783904127150579712
+002212025062613455610784185868762996736
+002212025062614343010784198089371475968
+002212025062617520710784247821972025344
+002212025062621562110784309285481701377
+002212025062717472210784609016881070080
+002212025062815342210784937932169486336
+002212025062915081210785293737018998784
+002212025063010540810785592184039628800
+002212025063018014310785699791389736960
+002212025070112062610785972766079791104
+002212025070209463310786299954057535488
+002212025070209530410786301594771726336
+002212025070213442010786359794903130112
+002212025070214042110786364830683586560
+002212025070314554210786740140835061760
+002212025070316211110786761654028451840
+002212025070318465010786798309144600576
+002212025070411065910787044968341204992
+002212025070515045410787467231634640896
+002212025070607530810787720962216898560
+002212025070717504810788233756076032000
+002212025070813271210788529809422807040
+002212025070908165510788814112488681472
+002212025070911342910788863829036843008
+002212025070919205710788981219712122880
+002212025071108401510789544757095559168
--- a/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileSimInfoMapper.xml
@@ -155,34 +155,31 @@

    <select id="getSimInfoList" resultType="com.jsowell.pile.vo.web.SimCardInfoVO">
        SELECT
-            t2.sn as pileSn,
-            t2.sim_id as id,
-            t3.id as stationId,
-            t3.station_name as stationName,
-            t1.iccid as iccId,
-            t1.NAME as name,
-            t1.sim_supplier as simSupplier,
-            t1.STATUS as simCardStatus,
-            t1.total_data as totalData,
-            t1.surplus_data as surplusData,
-            t1.expire_time as expireTime,
-            t1.update_time as lastUpdateTime,
-            t1.operator
-        from pile_sim_info t1
-        left join pile_basic_info t2 on t1.id = t2.sim_id
-        join pile_station_info t3 on t2.station_id = t3.id
+        t1.sn AS pileSn,
+        t1.iccid AS iccId,
+        t3.station_name AS stationName,
+        t2.NAME as name,
+        t2.sim_supplier AS simSupplier,
+        t2.total_data AS totalData,
+        t2.surplus_data AS surplusData,
+        t2.expire_time AS expireTime,
+        t2.update_time AS lastUpdateTime
+        FROM
+        pile_basic_info t1
+        JOIN pile_sim_info t2 ON t1.iccid = t2.iccid
+        JOIN pile_station_info t3 ON t1.station_id = t3.id
        where t1.del_flag = '0'
        <if test="dto.pileSn != null and dto.pileSn != ''">
-            and t2.sn = #{dto.pileSn,jdbcType=VARCHAR}
+            and t1.sn = #{dto.pileSn,jdbcType=VARCHAR}
        </if>
        <if test="dto.simSupplier != null and dto.simSupplier != ''">
-            and t1.sim_supplier = #{dto.simSupplier,jdbcType=VARCHAR}
+            and t2.sim_supplier = #{dto.simSupplier,jdbcType=VARCHAR}
        </if>
        <if test="dto.iccId != null and dto.iccId != ''">
            and t1.iccid = #{dto.iccId,jdbcType=VARCHAR}
        </if>
        <if test="dto.expiredTime != null and dto.expiredTime != ''">
-            and t1.expire_time <![CDATA[ <= ]]> #{dto.expiredTime,jdbcType=VARCHAR}
+            and t2.expire_time <![CDATA[ <= ]]> #{dto.expiredTime,jdbcType=VARCHAR}
        </if>
        <if test="dto.stationId != null and dto.stationId != ''">
            and t3.id = #{dto.stationId,jdbcType=BIGINT}