From 445053b513b423ff960fda37ca469e9ee61f466f Mon Sep 17 00:00:00 2001 From: llllon Date: Wed, 17 Sep 2025 08:59:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=87=87=E8=B4=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PurchaseDataSummaryServiceImpl.class | Bin 37897 -> 37896 bytes .../impl/PurchaseDataSyncServiceImpl.class | Bin 30650 -> 30647 bytes .../impl/SaleDataSyncServiceImpl.class | Bin 31609 -> 31404 bytes .../compileJava/previous-compilation-data.bin | Bin 9396485 -> 9396485 bytes .../impl/PurchaseDataSummaryServiceImpl.java | 2 +- .../impl/PurchaseDataSyncServiceImpl.java | 3 +- .../service/impl/SaleDataSyncServiceImpl.java | 34 +++++++++--------- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.class index 5cc53d3df226278775001ac9a686f565446e5dc5..81a16eac22dc96cbdc373568fff77063db737ee6 100644 GIT binary patch delta 33 mcmeBN!PK#WX~RQh#*)d;)Qfn6ecYWD9D@}=^yWmB75MI$dgpPkKPQ}1e5^X`p6TpGle^T}iY~V)S|^V6 z#7Cn~aAcbdn<^PGJH<7Pa={#yQPUw8O}|_=Lo#lz$W=2b*Gx<%%$(dXFXX0K(D*@a zn-!TfNtv>a+_N5;wmym3kleB58h6NDTO~8@?1@VQF?_*0DsmQR3<-RuVkbd^SW<1P z5jurs)k;i|+VD}eQd3CH_^Mi&X{0iI!z+sLL8(VCYAKtKN)5g%t>dVa;fKgeT)iJbfJk@^PaQoew3TK`GIMzxFm`eCFmBUH*JE1&_yL75rh`IMSegEt(QV9 zmamafreV38MhSbN1PVpo6!Zsl6I6I(A!*uo+q6jMW_~=wnR#Z;nO(ut70euJ&pJhh zYKY7M`$+pc1ntU>B0NcjJHo(;)b(?{3JbO;a@Ot5FUt>}sVhs6&+d)%pxOQ$X~hM* zIoik$<4O%h=h3#02X%ja7W0a_c?a#u`3R&|0Ib z_#)bF&D4i=(JFKfoyW3hl{!GJ*buEsw@?+n;x$#PW88!ugeXs)=7abqXBN-A4wPU3%o%Z&u9lPVNQ`yi8TPf zf?O%JMqrc@+G!SnGO$`haM0(O6Ay`A0Vv!}XT Oc0+eRW>U|)*YOu;44#1i diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/classes/java/main/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.class index c1db3c52dbd342a97d8b20c9a874b6918742ae77..af42ae59ba89954b913678da51ec7f9b914fd19e 100644 GIT binary patch delta 8286 zcma)B2Ygh;)<5NL?qv6-ZL&!=1vZ2d5^8_|p#+jZs0oB7h+-ZfMVb(iqOOVs6f9gD zil8Wpij61&B1jR%iWQ#<2r8iPp3nE51qJ!e%x)t1{rr9(KRElpbLX6yIp@s(o*7R4 zgzJCA@SDGH*#-ce`J@+e@CO_J?FGUgd=S9@#KKhkufiXF_!IuDTYm8a;O|~MOW-3U zvWb1*kmZB5u{L@2ug@k&QJff{crPVTqS&J(MSf`slgFlHFHEHr z8J7Y!r7B9ZDP2*}3t5!mg~pVr6|xj%D{7>uv7(To97RnO<=WKL3$5`7Ma^`l=3Z(+ zd5T*4D4z-xwemp`wYI5^{%xzMo$l1$3(5E&J!YXd3_YlWO&z`R+ewQeSu}OlFS{t} zs=F8Khi+PQm!YVK7Cmh$QPj%|{iwI1Qax&!kIJc!4;NBjFHWWkMg6pPf2}w`(Lg^S zRqEGO+7Ux+8mg$;+Z#sFFh#?4*AZTM$WS!W#);bUC`A`28ZEP>F*aT3h4J`<2pX&C zB1IP~8mH(I+uea_VMSB4)qtX@+R|l;rsP^ie~9aT&`%gqB)9c{lGNW4;ED_ znx|;KO$+?sp-L}YPgg0rT90^*qOc!gq>-+p>lH2XgRPYm&DAY8DZ1GYu{77FCDQX2 zFWjL$ajPC^srKVCFWg7BDZ1UJJ2Vt~ck1@#id^04E=6~H=^naQN9sO5c=30gQV(dc zQfJtMHm%ZYTCM0Iy{3nClCAO5BlM`EwUQe;=#P2naat!)Or|IFte@1+PwB*2ujpw- z&*;WywRp~^=e_U}_10oTtcW^|UQqO6EN!Hh^us1CHfym((aT=iO0U?oP0@Bmulm7< zzbo3QXqTehieB?e;u}}I?uT%kcHUIl>xX#l@3$1at>_&^@A@Hu_GyPz`5}=$Q1qdq zj}(2Z=o3Zz6@9Ac?}|Rtk^fxL7m5xjI;iN7qAwL4R&>NmU(wfEe51utEsiNV?w5V_ zouU(pPAd9``w?eK4*cu~Kh5;ZYJc@Z3RU{WeP_IQjAY9mqqB;|%f}eCAT3x6%MYm> zquACDN{d)8d)cRvqd3kFX`G-qQE`%Dzn7CaMbe!Eic=M*`8b_}vZ*--n1hf!wPtQj+be3POl#YF_UxMZgQm=>bvTEcIGBd%uA83g%XPRZE_S#X zH+OfWr-oZ3a$Z6Vw@k!u9nR+hn_D^Dn%mgi*5P*C9wF`zql0T^Ib6sc9PY@S94->W z+?l(aH?Z_++Gj@X?D-CN)vpqb`m~xEliCieojqm7B!`Q2d%S6PM+V!acH{0g_i(r; zm&ok67YbuS$ZemL;yxFQR~6XL;oe;8?g>taE8}v9`*2@}E4ZKAIpc%)rrgiw{tge| zfm-YR+*G%9rjt6z;lW&qpi28!miI3YiTx@b;#Ot0lJSSS*JQRTs^(!1-mJYboJSz| z|5#{Q&9sR#Ce+N<1X*}Isk=-q32G2xDbI-O- z^Ef<sfI79_<~T&3zTm(UxlwQjacq{P@F5t7g}XpEmL6>b1w8T~i!d zc(sFf<2?wTQ18m}kpAu2BUFN5g}R4I6knm0%N5UcYa7pNb)|zLo+q7#mzIu^aLngY zc^FhK4~iGqywJhV`6`4S-@LTJof67%yM{7juU34GZV$T`h1%k^?y}I_I2Z47_&V*o z>v@rzm@|fN;F0e1oKV>sd_+vvOqf1phRruRd=ua7@M2yfsd`Hyo^bG8zSZHS+}z=1 zeA{_RI&7lk{Oy?I?#szctl(Y_-@$j1a9w;+9-(aME{$8Y3YGUB-e+9js_MbLhv#9dP>W`xTQ{5DqGhONPH6hf z8MTu`eXFYmhY%s#{kABZ5ylE%_IEEX2uyB*p^ECN5ko?yqyNeb!o*>H2K6Z$9;$7V zA2k)K4fU_A>{A^YP}RROl!q-twbN&Xsw$0*yxKO>&_g%1nO-w*+=QCiiSFlJo4FNT zE9-739?0289R7-rI`|L#*5+f{ZO0w_PG{lK0fs{xn+%K|; zJET`?i(Kg!BlHOn!loh}gFV;`o68eo3(ONcP3o5Q@*?KC_w^nh*4-9J$2zdFCFTp- z4*6Jstpq&m0UwNqCD>Mmj)9qQHMYa{V8ddVfQ8rr6fA{Hu%o<; z5vxB$ht;U7Xb2m_w^)qbfS@D1g59wPNc!}Yt{p`oVz@*MM~w7}8tIB94XV8xR7-)e zOfCpYvW&`;H(Vk`I9+-U&W1mWO%~9;#T=a=@8TnEbFh`dUv^N+`0x5;dK~@{c!-q z!@nga1I0-R5{NGKt`VdijN<(EI7r?S#A7}V7Q~Q>O|Vjs1&uHRs|0zVIr?#kpcrT) zWyw%MHWVRYwIBsO;a40cD7HIPh}U&Iy>J^miNnSJK6nCd#}PPEBD)@z;wV9J#{D`? zBE3qaXe)ES>NCKWFPlk~j(yjAFt_gTz)_?Zg}b3OEP~NEMurK%au|RYitSW7D*+iR zD4Ux%pkb0p7fAv);sp?c7fY_h(N5Tb<3u-$yNGLyhMa)P@e-_oAP%N(_%}frIFbr+ zyx7a+MW7j$x}j}DSy{SqA{lkdV8B7?vws|qLJMDed> zm5W0fLmDPnUBw}dA>C6ZE-+JtL)J{ZRHh$*B2O_+!thi`f*zg@c$swc!*EX)PLmlX z!!(bD)1@uNbA_as-aAPEo?GjKEJ%k;wxu8)S~5t7mJOOAk+2M!DMvq-v?5`cCnypIjUtW~6!psj@rz!^aM`}L zI1Tzx`Np&+5Jyv1EObR12 zF=GkMUMwTY=~frB#;LcD*e#}qkDO^1IaZc94?5wkGCfIOs54U*AV^PHFQ^We%EAen z!ELxq2$N+(VZ2Q*2)e=oyj|KnFc2o=9nuy9lVxMysdq+07$PkTbhe4TwxCpO{8_hj zRDM!~sh7)PPHIjQgsVsCrEeLP+f*+-@|i3!Rk2=99bQnNiM{pcE6sXt zlPxt8F2#E#NgUV#Nyb4A41mRWAFhy1SOjYfb$Ep_{q;^0bblm;1nFcFmkQFv&JwnG zL*kaq--i$2N?C0)_y;~H{bC>wzB5c}_l0(F1Xqcx6m)ZUZSH=YryXjB zD3Ku|<{oM=S0XG~=1v*YH|my$Wt~!Rn{~cAW+cfv(=PhnaDAd|g@JPi57!Hd zL&=ngy)aIN4&v6QrQ=ZfGCqUPN)nC6a(qsdz4(sYNa<;LalfeOY58yiRG4YSLR&nA z&r4ejbise&20=FT#$#9~NUqUjNiPVBh2}(Nr^_y**7ac$^deTS&`uN>iId!x;YNuz zH)LDnojBO!%a0H^1Bp^Lm;z+HDJ`UsF*S&8bF0Udh+ICdP~>al@*#x5al9oCU6aKc}B;0ZNLV2Ss;m0IsXZB_?_J=!7b>SD5ztk{7GA@UHW)G*} z8tJ7oU5rF3!-#5WBoLSY&N-Ff08sU%n=TC- z$~?ik1gwPkzk01hsVl~0chiKdxbrmK!xOsysU?46Ugz`rXzK*lxz^7O^;QYB90o-; zsarB}ge3*mp($ZBo30j`;d_$v+r_B?{6q?@SB3CW@qoB>heR_CzlQF(Q{JZI2_e;8 z(iX%SQt|ATwiH?;Mf+>|Ev=CKutx%tMq?$2uS;7pT?q^E4byJ{%#$#6fB?@Gn|cRj zhj{?>$2SG0@i6FRHds236}P`7Z9(o0)y7~dH-?+=ZD~v9Ca}nuNr98J3*V99{O}dM zjqeH%Cc$nl$M+=u36>{X#o2Ow*3$5$6v9^b`b-d1g<(@93DgCVkfR`75XrYqkglC2 z?t*l>d4Q#2({)Y^*j6XpCv6J6R-q{=Vy4n@qCaiS8KY)bD-EFd|##& z2Lt&B{6J8=-q>x-=RY#%5-FA<=H>}eL=;LI6iP&)%#EF1npA!UO3Y5r>Umnu9kQ{< zPH!smy6HJFau(?>XVlB*=NHIfMCYF{g3c>64<^I#LvtkgP)@VZ^sKBaRri;R$UpaY zyUxf={wR_(06tA_jitgWb|=jkJS1qz2mM!o;)GUvpn2;(&?M+>wGqY@`-0xq`qv32 z1g)Si=xl-CbT|FD1x{;Npm89^nvm2YaqG>nMX?q?Y^=wc^dxjknN9ewi-ktyIgekjvX>C2yz4_*Ht5 zchDx@NiXv*k{cfSh+m`qyoWyHH|PNGr6c?%o#eOace&UJ^1GbH`?wpw&*l7q+>d_9 zBl#n_GYo&s3-}Yc0o%_vOT#k$OfJnnms_$gcr_oAo2@T-Js;t1a>wx&f6Yhb_k_r^ ze9R&~ZrOaoa`>c`%>S|)@qes*{;$=Zf3&*rFIFG^%^Jj~tvOP5F0{y6WLehjR*ZFz zWm~H)Wv#Qk*7~sJv!1scYqLCTv*N6MR)TfdO0kYv0SQ~s`q@gePFd+5pVi0{Z)JKC ztt?NjmF?*$zg=ZdHBk7mFDnZgNLZFF!wt+zN;Z6KRR+eP7hh6xoaG>An z0$cI#f|9L1@GO2Nx+&Hm`AmNAkNekEqIti!@wUrSrIbt-x&NU|I_i{FTu1S=VS!K2bI z(UbTG!^^=rdVmt7D_x;EK~aJiBm^JU3@PtmkI>^bTP(G95QBe8GC^Vh>oM0&&MVf0sTB$dOeDF*klV%|Lax)p# z*Jlv@&d&E2Y=p6YR&Ofm;d*@=Ps%r4>&rFg|8IQRa{p_5N#lQFPE^0E4!!)z_D|h} ziFM%Fgh|QhPsZfUn8L6L19f5O^}O_u^Os2ZFK>}K@~O|2TKs##Bn5tF`OOeZNpeCd ziis5-&c-Rdg2Gkb@;6c(os##fq+I${bbiCrc!mba|1A$Ta)yyt7APx!MQ`Nao-r#$!vp7xSVvxvN4 z6MJDJ8D8v5rY2DqSzbsWWl^+#dMxrPvPA&Jcqo?QL>|Q}N|2Ed85a3GFqINzT}raZ zuPE7~6h)~X$e@4+vMEh7q$|o$l&L67QMRI>q85r;T9o5~4tQKqD?KUKL#-)KQ5!F{ zrF=#0yiiE(E$X139TgSmNoRQ=5r5EYcJhRvCv~={i$|VkYtmH?O@;d7If}aJ>D~29 zktRK4DJs^ar$r@-dU;>~^;XnJuUhJ*zEtML1yt_Ai>RNX{+fG$W*n$!kPnb5_2(g4 z5koB+rf9gQ3~H!K(Fi@Y+9NLkMI$Yos3nh5RHNuz*)5H>Xp9Fgz~e&bJVj#_{X@|> zMdK}+pq$;964FwW6iv~RrYgEv&z$BHoz74+Q*YuDMVBg?rD(PfnCAGvph`va6kTS~ zd>@!p>4C+xP|@Xj#YKv)@IjOe(v@_TqQyS2G?St^dgN+F*Z3fs=2&!{qU${nTBS8{ zgI;Kv*5h&ytf3W(R$6qUh9Ym39=}P^YCXwObhC$UpO~*KYJI<~=oLk;DtgTaarA~(*bpDY(_4z(R`iadcNM*- z=zT@|6@8%SLv8s3iat{Gv7%2DeX8i7qJJs+%tN2k7n*#jNuwr*6n*8BxH_WfsG_eG z9aHp;^A@LveBh&BeRA59K1ib9J$Q&DS`X15icZUuMazd6H6cyd2YxmcN9h+!6XoG( z_Gsi)Z2KUYV-?3Kj#r%EVIL=or*o2Gzv5&sr*NvoGY2eALx>tYw0^dcVqkjxGF8f$ zS^v8CVKlN3_BuCpKgWqLj;en$Ca7>j{U`n#5VPwir^H}XHU<$Aowrn?$L1inurV1^ zoHeOAlUmxGgV);JigOX-OJ~lkn_V}n_L9m;b(3dKoE;a%t>ZaQ9&O_Bu+42b-{N*Q zx91KPceJ^H&q9cqT06J4U{2kXX$6(Fm)P8iJKNla&$hX%ti*+UjuQ-|rg!6WWCeHb zwAvXL6^y8xHD$&{Hg}irBLdyxi@1ly#Wwfk64?{?a_$JUQT?#L&Aqvg^GaZ1Oey!Z zxs1zg?#KO|;!n2G@# zFULhrV|qneKh3%rm)KZ?=h}QOkG6RXk48vyp0LxLi5aQo*?292XTJRDP+8ew;zXOz zGJP_X=agr5;^CsX`I#;GVxH#Qnb{+1I?q5z zaW3(um^RPkOX`2iY=g*&q_h!5W!3_2pQYJoQ21|Md zdm$LX;$Sbub$VJ~#dDnb*_XASYhyOglS$R3rDMu$zKr|G%iuD3Q9R$`1vVbwg$O+x zcWiTJ1Y0;I!Sv|M6))1`S2*Vf3ozuY4$h5PjgHM%Y7Jh+iyeQ9F`*?q5+VK2w!06l zyZ*?!D-YjyRpYAVhaTSe)$L2ey0YWTlRYe7k;K!gnB0|NcVu%7=9_hWGM65t3YgnqFHsxuA5) zMP-vNm@>U~n$36edYkXU2W-BZ?{Qvf+0K8j%^P^5&G+&B+TrB$1H9hx=Hx_g(gE=x zLbfwBG20oHQ;H8cYje&^*lcqtU#R$D8=u6d6hGpat%_qG)%Mwu4CHGMLyq@@i^L*?6#V_(pHowe!Eq=x3 zSNSzteDZaKjK-_4JJfLXSDSV%T-3PoiN>9eY16J-FP2!iNbwt5z?;s%yejWoHowj9 z*!(WP=iHZ982i4>`*jF>z*mS zZf&QT{0VcwsT9yf7K@xwjrG06m`pv3HGZRS{cM(&4BW%awoQXYId+^ zu&hsY`S^ZAt1A0cx2fxh?Spx_qdVkI&ufb?Hj-oW@&}J7A6(wII#|~+zez}4Sd7cB z8QY4iHrUp=xclsWlmGj4nHelCudXRC9}>*NJU8x|o_Z^1ips^SB75*ju6O^|zu3K& zGe5KWb8fWp7#_Cxkk;W>HXhMo@D(0*`t|IJN9r%{xekq^2)WLcCAm(YUil$E7?7rG zfi$OSI={KkGSnFTiQYlP`Zi%b8i4l`3;jik`}3TZHAJH>rhM>Gc~+2Wq8# z*Vl2Cb`QkE3s8Xra3I9O4-mvbqJlWlbhoC13)1RCQEexzkgo)>qT0cN7?QCiRthp8 z3)66jAQM`n4~Ghhf{xP23=?EQArcN3q@V;&VwIriV(2eA)z zES2*-%*WI8SCK2K04w{Auw#81YG%VzNch{At}C&bXRum{HpZw7Z0)wmp3MrAl2 zCqMuzsRz~yO2bjq8P6Aa>AVC~m^WlR9TA;w9BM*lVq}pFv#4niV{v4WG~?IEBI$fH zJ{DdCP8dV+0-PxNHH{{7oyF@c&Q*8Y%_$jaJKkf zidlzsI7fW1r8x!X3W|3Pf1z-OO*pUFg!7tBs8QHRg2W&_v_&q1^oSYe2@0D*qp+d{ zMf5UX^rFu(LW0v0pL%I%foFjQ1N8rRkwe2u|N1&)*ac_4W;q`YYx~zBd-#OEz783d z>?|MN?yp08hIjqT>*}hrvm@()gm`vxBwiOvq)Ml#ecKsP)nCH(j;i!Y;@OZdHb@tz zxIzL_tRZ0)&Wjp_#0EN<7UGrKe$7!6{wC=MOXaH#{5x2ZOxpgLAFh&b(v0f-;G~b3 zE$iJlqMe%_sw7~e;T&8l5>3d29K2f076s*yxCFLy*9DiG0b^yN zG}~_eJFljl&gs{lJI_7ON{OaXa3S6*PGZ9zNN^Qo!yvd0Z^Jbbe}!<5n>9R=EPYK% z6SOw$LV~n2iAn|OoX%plST}zgvVSk$j(5mubKx6YC-b794IFiosMQb7g3s}vqACSl z;2_>9DB4wl_FOG)EzZ*lb(biSCBov?H;XHg1X=3r9o;XYmb>Jf(yY7ZOdB(bFlS@csCJ)T{Jn)V>*YYer>F2x`&5 zO~UJiXW?FaPO#OB)n!A!^)SLytL|$Mq6= zY+Prd+2iwt4jSM2%qC*H7-9!DxQ4iSd|PdZ-L?B&hdV6A$rH&EK1_hK+}KQ%khsZh zEPPle?x-7!L|hF6+!#*6`$dB~oA}{V_}#7kv2YB&b=@ouzJssbFpQU`r~4BxJRk*nryyw}q)zS<6a!0TG2O=~=!-A8ZJ-H5 z@hP_rjFQd2=eB&}q!iz*>i9^@mm&t!jb1pZ>QofoatVZDBSOS)BSLyd?8o<|*LqqKU^0FpYJNtnn}T0LG47GCsra=d*=J=efHS1|*(+m7bdPlB`}9{@ zEAjE17$}9ticz1Ju|%2&3-JYa-U7G`UzG05&vQklj;PEK4}yVWOX-bx1oU*i1CiH+hW&k!^OLvFt$Q1?cXECuP_NNSxR?d{?Rg0%aYz|y?wmM01oo+imx3C^87&lx@X81%Hok35wN$-q~#j!h0@} zz9}qjo+OSiLrF73i7-gj!7^v~yw1+rX?8;2Q_xF(qlh1s{4T#c#BH`uYbErfX)T1F zn${acZ@A4B;ZaX5V2{U!3YQ#rj`@tHGR2RZ?Z64DF34A-Yt`ZoYWYJ59di z9W1BLmY(Z8@ukYbb^#+`?2;cUP!!kxd9XUX0J(ZB&L3q=OvsC$ybFGlZz>>H3DBYe z-Ybf}AIh8wlTzZ&ob|i2c+y$*SIij5!`n5$siL?*+;;e*Fy0?;+yy7Mf$2NFQ|`tg z5a-!0mulM)ixL6}+mQ-=`oV>X0n?x8_w7P4Sy56TsR33L`h_nMO($_y>kt$r2a=8L z7*&)KNEUv}#i_oE22@3XKuRF69ixlV0;yq;9xwwbB3Bb~g=&Eru0T&9&7aW#sXN8g z&`uvWP5!3uLa!{H8OW5GHSR<^khT+sGu#g;swlx7igBKqRTAiG`pr~PV};q?ERd&x zEycD+VS$q}J2y0%uZCK_2Ilbfu!NVvGF}c2uYia7CfLcV#m8@fxA-~i%WR}uI7!nj_*UcUBWH=0Pf;VxKA#XUgwAKUEYiz z^TXK4kKi$W6o2F`Aw0=j33(g&xSq24F>1??Qz7r5a^6V;_z9}vCutTxMJsqWt>UNY zQGSLRcn>|x&(d4Gm)_-lw4a}&&-i&d&M(l9{389#FVhKrh5nGMAjPk98owd;!*6mo zx#OwfcjPwoUAe=2k7se{eYvpPFPCf|@Ll{N-^=gwCjOW=%U#Y^{*<5K&*Z-8bAFM( zxY4lqu#wJ3j4VECXHQW$ZAbjb}oJ$9T!Gjn|AA<833>I3W0-5odgFB$#9*o61Nr z{YJW(Y6Q$QBh74Y1kC~?)9hqqnPo<{IZ~cuj20-3A7x1|-x$fQ$#^W1TT}4INN!D) zAPeW#0AVDzhSG3pB)R&jA(C7J^k^ixrqZlPa!sNYk>u*9RgvVHEWQ#>u30=Gl3P=G zN+h=icvd90rg2Rqx2AB{NN!D%-(iwlLpnzzMUrbGoQNb>AB^Vb@LkD!apHR6G#hWE zH>cSOcv(vD`;cH%!Cu@inbK#Bh9~g@L5aqN@F;#Lyh+A%Deebk%x|oN`S_7=BpVyx zQv6s@im?SklkgLPsm2Z%ho4Hz5HOyBk@zoRPBUJD!T6b=bmO3?_Hz-FVUi@cFJvs! zOpE-KNHE$+7x<+}i8Bh|6gJAdc(c==b-+BYsSXIzZHV+@g4{9?a$%$n$Y7)n2#VAJ z^W3I7U{*KP0dsg$9WeVf)d91#sScPWO?AL*(NqV__&@7_TL!{9ErIs&;Bm#db--nC z>wwG9R0ozp>(laMCC>S7Ufb3Hzw0}v#1_9nZ|P3t%E>PY|8MKV(RqdcM}6pdS&!C# zUms3D^lA7vB*-4}LwE??U%)3I(JdPB9)0r|Za}2Yk=8J%{6vi14mn!{OZzF*y(px0 zI#{IFbLY4<9fV)5FC+Y&BK%gquibVS`=9KsFh`6Q;kWQ>=>#;t+=c%C)|U|cU+aro ze}lmYe|Oyy$e&E#)CP>J2eSd=6EPtXeLFFcp#hUZ_0U^if6A{oq4KZnLR(0w%#n`% zTfv0iVWB+JL{ftM&gmKzjTdnSPVODxFZeKjDJ|8n@_mg&?+M{KiNE3RR3ZPIJ=mqw zU0UbTxh`Gc(vVA+P_3T2)P1=&EP&R~+6a0kBI-H!`wK38$)&Hm^i7u@cIhuJJ>k;d KG-bo3G5-UHPc26P diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/build/tmp/compileJava/previous-compilation-data.bin index 14acf18a2f7f44e77bf5e985f82f5d7af1345a67..37f0d35260733f9971cc366867911c57e5013411 100644 GIT binary patch delta 686 zcmZY5$ydw)0KoA#MA+T=blreh1H? zyy?>8=1*{TcJp!W@VR~u-|XPGyex0i(ca>(zcPa#bCo}n4L|-i|L%KNA1#l!#lHu! zruN~|p4g|7uD(A*(ah(v#`hJSVQVt+C4Z=>Bb|!`xyXN`7)>5y7)ySbixhll8Bq^X zi2}wko(W835`|1A$`qzDjp@Xg!Axc`n>iFQmwC)*0Sj5gVu~qY38j=#&Qg|9!E#ox zl2xpxk~Lu}QB_?tVn#5~U&UJ1v7QZVWE0hFW(!-{Mx5=`u!CCa*vT$-vxmLxV?XsA zpn-!N;xI=z$}x`9$O%qziqo9oEay1S1uk-lCN9&=6#t+#mhPk&_-~onX+Yq_u|*B{zoFUrVN|OUs&E(E7=S z272b#|D>$DZF|cUmcOS$vB&RHwdHQ_VoUtFnX{9ivr9y~`KBtZUM77cdu5g1pJn#sf@PYtu_&^F@_~9}95r9BE!BYg`8G;dl zP=p~I5r{+-q7j2w#33FDc#aoHL=uvbf>fJYnU+-`T)NNhYGXF8bI&KgpB;$Z;;}Ui zFYyZL$iQo4A`98bfeg9GLp};nh&L!gF-lO1GL)kNm5`$f)u=%&>QIjcG@=R3XhAF9 zLV-5CLpwUqiTCKj{l5pj=tDmSpu`|PUg#8+Ve diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java index 2577ea1..bab198f 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSummaryServiceImpl.java @@ -339,7 +339,7 @@ public class PurchaseDataSummaryServiceImpl implements DataSummaryService { " c.Year AS year, " + " c.Month AS month, " + " c.WLMC AS WLMC, " + - " c.SLGC AS SLGC,, " + + " c.SLGC AS SLGC, " + " c.tstotalAmount AS tstotalAmount, " + " c.totalQuantity AS totalQuantity, " + " tstotalAmount/totalQuantity AS PJDJ " + diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java index 50852cd..dca3ea3 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/PurchaseDataSyncServiceImpl.java @@ -908,7 +908,8 @@ public class PurchaseDataSyncServiceImpl implements DataSyncService { double djhyfDou = djhyf1!=null?djhyf1:0.0; if (yfdjhs1!=0.0){ safeHsdjhyf+=yfdjhs1; - }else if (yfdjws1 != 0.0){ + } + if (yfdjws1 != 0.0){ djhyfDou+=yfdjws1; } BigDecimal multiply = BigDecimal.valueOf(safeRksl).multiply(BigDecimal.valueOf(safeHsdjhyf)); diff --git a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java index 7ade690..d9c2142 100644 --- a/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java +++ b/com.awspaas.user.apps.bnbm.datalinkup/com.awspaas.user.apps.bnbm.datalinkup/src/main/java/com/awspaas/user/apps/bnbm/datalinkup/service/impl/SaleDataSyncServiceImpl.java @@ -894,25 +894,23 @@ public class SaleDataSyncServiceImpl implements DataSyncService { try { do { // 构建查询每月最大日期的SQL - String maxDateSubQuery = "SELECT MAX(DATE(" + targetTimeField + ")) as max_date " + - "FROM " + targetTable + - " WHERE DATE_FORMAT(" + targetTimeField + ", '%Y-%m') = " + - "DATE_FORMAT(t." + targetTimeField + ", '%Y-%m')"; - if (startDated == null || endDated == null) { - pageSql = "SELECT t.* FROM " + targetTable + " t " + - "WHERE DATE(t." + targetTimeField + ") = (" + maxDateSubQuery + ") " + - "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE; - pageData = DBSql.getMaps(pageSql); - } else { + String maxDateSubQuery = "SELECT MAX(DATE(" + targetTimeField + ")) as max_date, " + + "DATE_FORMAT(" + targetTimeField + ", '%Y-%m') as month " + + "FROM " + targetTable; + // 根据是否传入时间范围添加条件 + if (startDated != null && endDated != null) { startDate = simpleDateFormat.format(startDated); endDate = simpleDateFormat.format(endDated); - pageSql = "SELECT t.* FROM " + targetTable + " t " + - "WHERE t." + targetTimeField + " BETWEEN '" + startDate + "' AND '" + endDate + "' " + - "AND DATE(t." + targetTimeField + ") = (" + maxDateSubQuery + ") " + - "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE; - LOGGER.info("执行查询的sql:{}", pageSql); - pageData = DBSql.getMaps(pageSql); + maxDateSubQuery += " WHERE " + targetTimeField + " BETWEEN '" + startDate + "' AND '" + endDate + "'"; } + maxDateSubQuery += " GROUP BY DATE_FORMAT(" + targetTimeField + ", '%Y-%m')"; + // 主查询:通过连接查询获取每月最大日期的全部数据 + pageSql = "SELECT t.* FROM " + targetTable + " t " + + "INNER JOIN (" + maxDateSubQuery + ") tmp " + + "ON DATE(t." + targetTimeField + ") = tmp.max_date " + + "ORDER BY t.ID LIMIT " + PAGE_SIZE + " OFFSET " + (pageNo - 1) * PAGE_SIZE; + + pageData = DBSql.getMaps(pageSql); if (pageData.isEmpty()) break; @@ -1005,7 +1003,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService { LocalDate now = LocalDate.now(); int dayOfMonth = now.getDayOfMonth(); - if (dayOfMonth == 1) { +// if (dayOfMonth == 1) { try { LOGGER.info("开始执行每月1号的特殊数据处理任务"); @@ -1049,7 +1047,7 @@ public class SaleDataSyncServiceImpl implements DataSyncService { } catch (Exception e) { LOGGER.error("每月1号任务执行失败: {}", e.getMessage(), e); } - } +// } }catch (Exception e){ LOGGER.error("汇总数据失败 [汇总表={}, 第几页={}]: {}", hzb, PAGE_SIZE, e.getMessage(), e);