From effa3d223c2cfbecf2b94cb4d9ac6e11ae271f91 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Tue, 13 Aug 2024 16:29:11 +0800 Subject: [PATCH] no message --- .gitignore | 1 + .../order/pojo/DefaultOrderManager.java | 50 ++++++++++++++---- .../order/pojo/DefaultOrderManager.class | Bin 247613 -> 247751 bytes 3 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f97022 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target/ \ No newline at end of file diff --git a/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java b/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java index 8219824..283884a 100644 --- a/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java +++ b/src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java @@ -7567,16 +7567,48 @@ void createQKCusFee(Order order){ } void createhlyjxcqFee(Order order){ - String province=""; - if(order.getToCityCountiy()!=null){ - if(order.getToCityCountiy().getZone()!=null){ - province=order.getToCityCountiy().getZone().getName(); - } - }else{ - throw new BusinessException("送货城市信息为空!"); + + if (order.getFromCityCountiy() == null || order.getToCityCountiy() == null) { + throw new BusinessException("城市信息为空!"); } - if(province.equals("江西省")){ + String lineName = order.getFromCityCountiy().getName() + "-" + order.getToCityCountiy().getName(); + + + List contracts = commonDao.findByQuery(" from Contract co where co.balance.id=:id ", + new String[] { "id"},new Object[] {order.getConsignor().getId()}); + + Contract con = (contracts != null && !contracts.isEmpty()) ? contracts.get(0) : null; + + if (con != null) { + List contractRates = commonDao.findByQuery(" from ContractRate cr where cr.contract.id=:id and cr.routeFee.name=:name ", + new String[] {"id", "name"},new Object[] {con.getId(),lineName}); + + ContractRate cr = (contractRates != null && !contractRates.isEmpty()) ? contractRates.get(0) : null; + + if(cr!=null){ + double price = cr.getPrice1(); // 单价 + double volume = Math.max(order.getVolume(), 0.1); + double ysf = volume * price; + feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); + + String province = order.getToCityCountiy().getZone().getName();//省 + double additionalFee = 0; + + if ("江西省".equals(province) && order.getVolume() < 2) { + additionalFee = 20; + } else if ("襄阳市".equals(order.getToCityCountiy().getName()) && order.getVolume() < 2) { + additionalFee = 30; + } + + if (additionalFee > 0) { + feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "送货费", additionalFee); + } + } + } + + + /*if(province.equals("江西省")){ if(order.getVolume()<=0.5){ double ysf=0.5*155; feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); @@ -7602,7 +7634,7 @@ void createQKCusFee(Order order){ double ysf=order.getVolume()*55; feeManager.saveInputFee(order.getId(), BillObjectType.ORDER, null, "运输费", ysf); - } + } */ } diff --git a/target/sdtms/WEB-INF/classes/com/dev/stms/server/service/order/pojo/DefaultOrderManager.class b/target/sdtms/WEB-INF/classes/com/dev/stms/server/service/order/pojo/DefaultOrderManager.class index 4756dff81a4ead16444802616f06a090cc22ec50..427d7187e3a0a3387611a6de9affe165594c7a33 100644 GIT binary patch delta 5227 zcmZ9QcYIVu*T;Y7&feXHkkA4oggccQYItZ#=)Lz6dJ`#14}>BtAiXG3483<0saX(_ zCRL;es0au=6p^mtLlxcu-}3pqe`LQi=gv9vJ7><$O|s{stVcf1I%Ye$@m(_eXGA~C z68${-1%dVLI*i~Ju3584&0zH3giN=#EWN#Y@2`u-2BTlw>Fw3yf19`M=FV}1$nO37 zr4H)aJ+*n))EpSoCPVL>lU)T3*_n4FtPxi+Nr^K^r#q~o3 zkPV>WMKheHhmqN$=MhBhMw_-dqt}Jees6lhhb(`3lNv0)X0m1@gE6#S| zsDpihv1{R@BwwuWFrK7;T!ZnDFC!|{qOGr3i(SqPAClZy_b}pO-T(H?9_#*(>xj3m z{#gHEtcvw#1m~wDL zV%zZKp2Y4jShDh;nwn5y%3BXgJEFf}PsaK`qnQ)@i1#5HhJ=O#hf~DcdHKe0L=q9STztB`!|}|&wnN( zUZWSX1V91Q|7XQNj{<=aj4^9rfOriK_y4VVlc@gzl5CouO}RmO-gazv!q15CF51Fh zLN4zLq<0;Kyc_6Z*~7A*ipt(|)bn1TsrM2~E!TK|W4reXyS>+x*?UFVIY@A# zg504YmLG5*jpZ&)=YINx2WdUeM4$1@^aamC+ju1H=27$`&q~*Lc6!Kj&@-OXVLX@P z=eZpj;(45cJk}|}^EwrHoYRx%a|UwHS;o1ufeU9lm(F#rocmlmPq<+Pd45)k7hp-e zAnVNwvBA7B8^w#T&v-n`;6>R!UW{Gf#o2XUg5Bq(d;y-|i{zz!N&H{FO1zA(Eidou z&nx&+d7>|kC;397ctzhNUdcC=SMkl~Reh^@HQz>F!?%~$^qsT3z-#$_t5sS z-RHc6pLj=qkazM&@Xr36yo=xCU8DW^c{hJi-re7n_wcvpL4Ob4J6zx$HkpOqLo9zE z@w_j}@P0_<{n5g*EgygZd>{t%K^V#hV?0mA3_cVKcp8@SVc5Wj;|o3#hxrHio{z#M zJ{pgBh=P1HMe;FJnvbOqB>7UZN3mq_#$-Si!s4+Dqn)ld?|MGWjM%} z<2(LUxK1CI$rsv-D8A3e*pCwY0Lt^dsLT(d4*v%A`5|=Uhpq1sEaFG8j32{FejMBQ zw>Vb{rDZk-3{H7!LEhnD;>Qv%)oI3oj)104h zI`9Y1yZoV(#veJ;`0vg(%bolW=L-MRxx*hjkNIEDYyKbR@Fy%cf69tkCh%vhF@Mh5 z@)xW-f64msS8Oal#HNYd2siG}9{55cFCs)7B1JxA6CR=khZX{LghYLz&`KDji2Ud* z3LwpLv?z$lq7dea!k8zDV5x}5KFcGb7*2}fcw+fVlpsNp1ts!p<~>r@u?omQfO^S)^4 zj24ZZ38IO!$#R?JSC;!lQ|Gv7=A0AFoqM8%^IWuKj%dx|L>pGZzA7q+jx1SpVzotA z)=a$f_6lF|=B>(_zq!G~Nkdp27V3qd=#8AB4{{6J=;D2NqA&7`eyC(w-LipYQ_&x7 zgl%}sG%*lk#URWVgRw%SVzU^6V`3;Si8Ndh!*E9oCniQvZZU|Y82xtN4)%TrssDX* zsQ-R*1T%)SG%7F_nZ$?4F2+NN38-vYT}(trF$q1zWb_wPFkDPeUo?W9Ec+2$@i8)s znfBo9cR|d86thuG%t1*p7s(>sy3Vtj=cBP$fOcXL`idptr6XC26Iy0{ms{Tz;9@0= zScSr34N8c$)^|P1iVY|)K0}iD+~&Rsjl>sdD>kEp*n(bS8-|JP7%z5UlE}bpvClTZ ze*7Q~P^36$bNz<$i9-}G4pX8yLKVePY9NkLOKa~gPS6!(l5x<~-xMDl;sugn0cH(uk7dOyN+{6gWvEmk{ ziC=9e-o`@ln>~m-IB0oX+{HO@57)#4+!hasiw9&Zi&-X!N0cOfryAl9sxAJcCgKUD zh^O`j63-}2Jf{)jC5;n*(*p6D7E91N$!MDlg!7GK)tzoKGnkA(c9{ibWh5%dDAbVI zP)lYIR&Ml z{8Cd%SunhBJX=5sMGzt5kwX?m8Cep^vJ_G+hg*)boG43UmMnwCvMhGUayTN(ho?Zop6Pu4&SSrc7kE%cPNZH!u2CF@|5tZVhv z!vR^}YHWa0vZ2-1fHGU=w2YCBsDNxtm1GlYBAZfc*_?*T78H^#X`F0D3uJ5is+Dc% z3zOB(^*ayx@1*cwkm$HDz4fxU4xYWMqzmqCFL#D zv1}}VMT)$Q?(!}M$a_eW_wl*qcKN`nc!<6751f#H;;ej(3-SrB%BQwePi(24lCmr) zpV=dQPUYkaswZDkFZnkOmak}l$5DPKQU#nC6?EcNmhkAA z>=?zXC}dGtkxOMmF_j%vR1T!5oOoA7W2m)_QF$;`#bBn&8y+}|Wu@GTBfAoaRT5e$ z#4C-GDu4LX*-TTBLXfI3il`!}s^ZZ?6~+6i7)Ge#Hb@c7QKhg%C18~*6TUWwwR2ik zK!i%P@sf~7CBst{kzZ9pQB@fgR29@xRnc5kLpxR7im72m)WjlXJ4)5YW>p7aRTp2Y zdN`!&c~^lu{{HTU*po?a)xQM>EyI zCfpHSR44ROoiR*xK}dDSWc4mKs-D=Pdf|ZTjbo}0&Z)k*WMkb?{qaBz#9wL<{-aXy zT&2BjfO*Jjf0=#p&m|l_HlOYEg@%KvkqD{}kX4OBoC-myF(|FZqMF)?)@m0zs&VL~ z#$&9Sfca`7mZ?ctsU~Bmnt~&0s@-wA-D!s1JEgO;yz#YNbA?t9dk6 zEu;-<5$#fo>7-gpzp7<)Pc3(%I;qu;QEQyiYOPa8t#`Vp4NecW(V3(+ISbVUXSE7B z+tn6lr`qOxrFJ@J)Gp_u+U{IZ8O~KZ|I5x_t1u(AljT;sn5VvE(vHj8aYeN!+-WJR z#3J|FBin~EYQOEDgX!y5u*;E0t?8IG9k-?vZ%mcbPp@QyBF~_J`W_|JStP3S=}lI# z&5=J_(?x5#WKF-kF||nVyqayQcHNfl1~RLg$gOVK(*25p>Nbk2-)z`BNK$w0LEb}M zbssI&19Vmo@t%5w!RmL6RDWQKdYs;P4cim>)Ve=IKK0bPzX->yWxbt{wtrr02N9Yf zkM_Z67e%xm#dH7_br217CN$I$=&!S2xQ@gcoef{=>^Q1(;Ec|N3pzKh>KNSDv3Q~L z64P;1MCYS2+M`6xslApoLMs}jH7(UHeXa}97F~pP>Ui3vixJzS6T)l*``!taK|q&9 zlrD!{x;%>O3Mi+OQAt-sOPWOe<{ZLx> zw}Jj_j`Po!#kGS$<4DMe4E{(2e>)-xzg&!XviHhmheKcaL!lNMUTW^4FTe?ni`@fkb* zNzb8+cKpbWpXg7+g|@O*P67Kb0lff)^g>(RMW~<`qnch~6IzNCy$qf7eDu;Q)0b~& zf8<(Ym#(!-*P)bNk7T_Dwe-gDx*e>2rqE{FF%V=Wp8Az9O~3YyGw@9} z%=fYJ`8FEYx5ET|drcu+hw`3IQt{t+h0Ki(w!=bDQCMW&K}wW;ji zYO44TnyUV@rkej3Q{8{t)b`&sbpioXH;~;l2*jC&fnugn;9sV3prUCKsArl6+L>m7 zKBjqKh-ncBnT~A&<4j6miD?^HXF3G7nvQ{krc>a!=^Qv~x&*G8u7Tf8w;-AB!7Qd{ zFstbmENb2lmNk8YRZYKO4bwk3zzht|)LVl~%;4Y(lNwxah6Fd5p}|dNSh&M}c7u5% z5ilPhvl)c~W;Bv4tC+|w=uNJ2@Z2M~gQbg9yNR{?1O6bG=NU;zX}550t5 zhYm_dq(%vXiqawiqKH)C9en=$&;p-pYPr4?7hBcpMB3-bMWIlJ3q=ZW+OTA zErT)l2}OSzGd5@A(#shiUEVV8((d_J#;&=vW!u%|+jKDIAtB<*x{RE~yRXh3>#xuhvjZshx7r-@L6fD(y&W&LD-d%pj1IdK3&cFwjOH^iHeoZ~kI6G|`W)z(m`4rc zH=>LUbrqs zC=het|78aw{B`&8IDLG!KS5&x)J|ER40DDwZKO8=u8|3_iAEuI$3)L-?m4{Zo=1k| z68Bqdbic!P_j`(TzoUHa1(NO$6zBd(!z|x$FVR@{GJW7)p~-FzEq8ySmF_iK<6fr? z?hV@R-lQ|`FZ6@^EB)gBM)%#@jJtQ3-~EHBkb9TKx%XLF_W`ToK4g8|N9;BCPd3ke z%rf04Y@-0XD2UwIaD5Ym^vw{;w^(T3 z3gP*7i{id4%d?_{?ogSQoKd2@GhQS)GsUyc z98tkpBq}*8MP+BBsN(DsRh=J1it|8J_mimM4~m-pDDj-XfT-nnMeP`Wagpjz5Ow@7 zin{&|ZjQf~Xb@i0lfTD9jZjoHM!aZ(3Zf}eL^HIsY$smCAkiE{L<h5(?C{C{Ji-^sKyES5)|ij7VgV|P4Ac}0QC}=V zL$Mg$#S)vl6tl%L%oEG8P-J3*Sb>A~`IuOVD`FMyi`C>4YbYSrQXa96%83nBOKhZi zViUCzo2j!1(_pcMW{9n{NNl6kVmoaWJLss`NykHC7kw{w(~sga$`PN_O|h5miG7TT z{Y;7jEM6RBHN+8CUwpw@h?T6PIL3O5<19^_U=zhjw!w0XIK{pfr`a`;#eNrGu_xkd z&cqpBNM!Rw%Or7@Hx=LTcH$iGAccA)>`2+tNP~ zBOb$uC#Y{<^@ftrT5`0NK6H@|(k$PUe!M3Gm?ndmE+dd3BeBQwpv;A1G8%U+AIrSt z$b6JynJNoVV;Mv3WI^gDi_j2RlqSk&XsL{)U9uR3PT0UVQqm=<=#kVcC=HX+V@Xo6 z6j_SZl<};!Okl6bME0gE%ifXY*lNoSmOCszljYeFnZ&YWGP^FHWe;Qp&SWJXD=YJ| zGMQJAHF%1w$?M75yt#b-uRC;sz1YB8JiS80`-buQyxR*1$_6MP8={c3gDxAxl}%7w zHbo7~RLe$|FUn?kN!o$8Oq0zqR<^(l*%Aw6E3B2Raagv&dHE8)mu+!Pwj(avQz6-c zl-<>70dV9%M9M*k zmUi6bU?@2RiE=2)$ze#5X*P9)wKWn=sVU|2>dwm3ZEsw}AkR^}e2YC!R@;C{3j6BOk%OrV%s>zd7N1md3@-#J*XQ-{r zwwH`NOKI{O8YR!uIQcEjl;6`Fd4ZP6i?l&r4KEqTQ(1R;4P5?gPwBdC)eTgUH&I94 zLS6YQ8q43%)AD6`8^h%9*4-W3sz0p5yU4U$C+}gqypKcj0Zz$>I42+Bw*1q+4v#4) zpHOkdsGRbL8@|J5Qc?t>R3!4NC{$2+kfQQpsO3n@ahC6@{FtI*Fh>={CRGRrRpD^K z@%%LwddB9(BDX4rg33i9B~er4y46RI45tggP$W+S^R?D$VWn!ONfn#blzEW!_O0A~6mPIXvT4zmepo(fE z)m59QliEzfRG7xAt$)4VA0amoZuKEAz(YH%i=EcRF6&~CZPRB^>T{G*`%z9EKz+-m z>LA*xL+GKtz#w%LY3fU?vfQYSSr^B#Tb;sDbsDEt7S5_OxS+CatIpU~Ws|myQ)lgw zenXYiIclKJQ(yHh4N>3GL}h2os0%bt{XnbLMfzM_qOa6t#?%!St*){nDu>0Z>*3&J zewgCbP2^I)Sf{s;sD8zB>No4^HhQbyG2F(+sJob;?qQO85Pmp?=b=LCG4iP=D5?RY z3Gtetoc4v)RBotr07?f@T1TLkjzmixg;#VgjMCAVU}IBtUd+|`ut>**U!KO>v(`lr zrHdk;eg=hgEL>d-#kGqBEl@>E)YS?tv_^YvFkE|>q>E#=wiBh}uvV8uSeL>sT^jp! zJWl8YWa~s+)MdiYOy}F^)g(AN+17v7)~;x4SF+wJqr9$Sy;VhhT@8(O3YzQcXsc_W ztFDQ@`Z1Md8o8yjdfj@LBJkT$N zYtQ6Ie4%#Wx&wl`Bl74@h}B)7bypz){^dtrv|jd{8c7V5s( zqWj^X?r-bAV(Y$YYYw1ddN3vFAyi8brPg{l4bW*cM310p`gO|GZ_rjfnvUrZUDadg zx*p4Nch>JPPru8O^>|iazt6hr39Of%$j0lB*eu243bcQ{kd8nZ0<2k)Bz1SjN zGkwrPo)Nvw#+Tc8rj4(B8ebc|4kh$@l+_zhRc}f^`!ux8hPK<#4jbC_G}JQvr^S4A z?Y*{j`w*%3qmZ`$D)m9c=|d=^58H}IP)&bfkL@U4&|jjJK87y(I9}E#Fhrlk>-rSl z*IDV=OZd*{Y@2=-#dNk!KNnuGl=ovH{evBaAMGeyw4-ndp1y2H^a>L7RaDnGXrzC# zqwq5Z>gyP(Z(xbOg>Cv*9MZqxq`rf*`VU;t_i#hs$3y*qxPC~b^&_gF|D>w=F?BGY zQHE%=VU(dS(<&37btZzgm`K`cauMHY@`XRl%B_LwsG!j#3=rX0RC zs!_K8-g6DBTRASvIiN2DX{kXouA&t>73QKtiEf8hu5v=tyzhY zC}c*Vq1+};=dJq*Df7zm%fMc=6$4?cTv|& z3@2~q9U?-L;F!sXGE4yyVrCqHq&v^%)k>f)B2xfPk%POZ{|?g%%#gF zgB39Im@@O3HVauPvxucwrkcg9v01{}nPsepSNxh9dnxBGg-bE^OaASY+osJ z)>qYhzBcAtU#O4y&X;Ds_l+|bd>@#LzK_i%-wJctx5?!AcAKAkC(Je9 z8S}I6g1PRyVQ%;yo10E<^NUl|+;Ti~+le#3JE`W5)7ac|+L-%JAM?N&U>-VY=8^NZ z`O}$Z9y^Q86KAalXPd{Jou1D*>p9LvFT%OuMTVTmUXz(JK>p)+-yR?v)EP@X80;dr5)*UUFcV_iP~Kb*dZ~=T!;J z^{NJzdDR2!y&8eNUd_M}@43KfuU6oKS3B^lml`CmPB52OKbXgRA(-Gb4p#J<1Z#Os zgLS-S!9ia0;3P98IM-_#T;R0|F85joGrcy!)n421mCyJk?sh=H>xf9N6H0iUQO&Zp z*9DEduITJ_4`1ESgOt=8dAvTz@AXANuOG^K{gL9mjF#Rj=;XbMK32cx4MdtZ2&28% NFy0%St`730{{=W