From 7ba9c25610df3d8aa152141560313f918aff25dc Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 7 Aug 2020 16:50:15 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 36 ++++++++++++++++++- .../PHPExcel/PHPExcel/Style/NumberFormat.php | 1 + 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 045fff193..6822c9809 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1873,7 +1873,6 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); - date_default_timezone_set('Europe/London'); Vendor("PHPExcel.PHPExcel"); $objReader = \PHPExcel_IOFactory::createReader('Excel5'); @@ -1918,6 +1917,23 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ } } else {//游戏 $product_name = $value['game_name']; + $objPHPExcel->getActiveSheet()->getStyle('F'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); + $objPHPExcel->getActiveSheet()->getStyle('G'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); + $objPHPExcel->getActiveSheet()->getStyle('H'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); + $objPHPExcel->getActiveSheet()->getStyle('I'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_000); + if($value['first_ratio'] == 0){ + $value['first_ratio'] = 0; + }else{ + $value['first_ratio'] = number_format($value['first_ratio'], 2); + } + if($value['second_ratio'] == 0) { + $value['second_ratio'] = 0; + }else{ + $value['second_ratio'] = number_format($value['second_ratio'], 2); + } + if($value['promote_ratio'] == 0) $value['promote_ratio'] = 0; + if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; + $objPHPExcel->getActiveSheet()->setCellValue('F'.$line , $value['first_ratio'] . '%'); $objPHPExcel->getActiveSheet()->setCellValue('G'.$line, $value['second_ratio'] . '%'); $objPHPExcel->getActiveSheet()->setCellValue('H'.$line, $value['promote_ratio'] . '%'); @@ -2015,6 +2031,24 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al } } else {//游戏 $product_name = $value['game_name']; + + $objPHPExcel->getActiveSheet()->getStyle('D'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); + $objPHPExcel->getActiveSheet()->getStyle('E'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_000); + $objPHPExcel->getActiveSheet()->getStyle('C'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_NUMBER_00); + + if($value['increment_ratio'] == 0){ + $value['increment_ratio'] = 0; + }else{ + $value['increment_ratio'] = number_format($value['first_ratio'], 2); + } + if($value['ratio'] == 0) { + $value['ratio'] = 0; + }else{ + $value['ratio'] = number_format($value['ratio'], 2); + } + if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; + + if ($data['withdraw_type'] == 2) { $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, $value['increment_ratio'] . '%'); }else{ diff --git a/ThinkPHP/Library/Vendor/PHPExcel/PHPExcel/Style/NumberFormat.php b/ThinkPHP/Library/Vendor/PHPExcel/PHPExcel/Style/NumberFormat.php index e8a978fb2..adaeb51c2 100644 --- a/ThinkPHP/Library/Vendor/PHPExcel/PHPExcel/Style/NumberFormat.php +++ b/ThinkPHP/Library/Vendor/PHPExcel/PHPExcel/Style/NumberFormat.php @@ -47,6 +47,7 @@ class PHPExcel_Style_NumberFormat extends PHPExcel_Style_Supervisor implements P const FORMAT_PERCENTAGE = '0%'; const FORMAT_PERCENTAGE_00 = '0.00%'; + const FORMAT_PERCENTAGE_000 = '0.000%'; const FORMAT_DATE_YYYYMMDD2 = 'yyyy-mm-dd'; const FORMAT_DATE_YYYYMMDD = 'yy-mm-dd'; From efa8cff4c49201a3aaa44491799f02c7ff58534d Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 7 Aug 2020 16:54:42 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA(=E4=B9=99=E6=96=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Admin/excel/up_stream.xls | Bin 22528 -> 21504 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Public/Admin/excel/up_stream.xls b/Public/Admin/excel/up_stream.xls index e5513683d8c06fe0f2e56969739770c6e36a3003..467e8cac24ac89d79ac2abb4d16f28c25eae5a48 100644 GIT binary patch literal 21504 zcmeHP2V51$)}Osx;9iOX0xGCn5CIVp6a^a~mZ%_#plDFBp{OWU6f3dB0xHJD9%D2{ zqp>9>MzLUt-NasEVhxrUTb>57@%_*2UH10qd+&R{?|r|_GCR9x&iv<`GiS=q-sR+v z&euNO;&GiBgh*z^UYDwwjSgMFHANnr81ume-M=m^EftB3;qveBUu1z-kkt>3XN9Ol zv__;hw?$MTsuArF?GYUi9TCeRmPdpOFlR&;#0rS6h;E4Ph!qhlAy!88K=eecf>;%? z8lo4X2GJXl{D-11u4^FrYiR-6^uNfQ|8=5vWSKZdqAgmoAxMX_Y*_uxgF8G%Qd)sx z8Wo)xE97U^N=&rpQ8N=3WtQOpm__{3+G;M0-(d=iuwiIQ{Q>h`lB36?(CaH7jsDVY@d+U^eLd*O`KCR_?`_u^Wip*iiI)p&9GT2D1Th zlK~K#T!joq;%ff=A%@G)OCT8vVc@2?QeZTpd$c*u75I4*=h(^5P5DTKajTVgK3X+5C9yrxDU?q7SLq&XD{!>< z5Z@Z+91cVFVi}BTd1R)RXvm{tJ4sy#lmSjP zWi8A%6`0_|ib{Q0brytJorSQ*Or&&UwRNb~l=ZQgsbq>hg>}Rz+n04WQ!pGWpvuMt zgHe~c+QhtS%4X=W)yx;QT(bl+fCaL;Oh{!Kt$=~JlJzBeW2T?0ue&J@A6UnSmlDfH z^XqELWL6UgugqLEL^oFf<(Y%dMiVtMuZO6vDOvR^GtVbh90gaAQ6#hIe`z z7M6rIU8|TY*4+{{Yb+JFB!Mna8rzHxA*5gl6T{-!D6A0bqEn?n-;P+^#NhfJbhIIe zv|h;2Q|`@6UDHm)PfO{cLkfi&q6@g?^e1mdr@7P=zd1Ugn&SWeOc(gW9cf5Gv@^qy z#O?4*q{?)yeQ1`apbX^gLXUi$|3hczh4u^WnX(S2GYko)acY{O8{*q@9D0Q0IA!(L z*5cPPi9?T_`urk}59m+m!NI_PX!7aNNtLr9;Z3|EbD+vm`iL&dL-AOFy@nTAMPN&B{UT>K{h;-U65b6E;iTvT5A7qhU*1n?u7|UtL`Kw6$XIW2N!n~rK zv?Za{w-;lPWp<$L2~ID=7yXvDAoS_A%*f-(>BjOzn&I~{Lk}`Tm;BjK9?^e{>uqR8 z9Vz$aH$< zl z+e9Bnw1bX3W%y)&Q*@FO^zr&QqMSrGSFb6(z;7UrET@wbw~tmH2gx5I6nc8eblSC) z?ci9(ZE~6W?i|jx8_&W45zZ$P{W#h}{Ep$va zhmBY=b;<-)Z8kxV{togK*#5;vH?d*oO-$%DkTnyG3$#YQ#R8QLYG{K3f`k@eklB`J znyP++%8)nZEqJ@V1#kDa;7xrC-d=CP+wU!S`&-~OH2x^gt8Gd{gT7}0$dGr69`E9M z{mT5rxS^(+<(;p3oGZx@0*f)Wse| z4b0HB5gVmi~TH>_Dy zOwb<-$z*zhban7Pe>zlA>utkg3 zCuH<0H>`$@EK1$N(4tk1EGl&cZ#0}m=}h&qY8IuFq3aQ}`T4^Xv=^W)m5^*2W?5=- zE5qLCV^M0!#k^U4%Tk+yu5M9k3EB-am{D`l@MG9qHH?}|8iw3hxG@9`J%$i9jUc4q z#v9KJ7F*oZNET?(b~1EB%eFHGUCW~FBxpChu`{wA^&CURYa1yp^%ifu=dtLIraEFB zi_*!^O$gfj0>u<`2%s&MkotI2W5sC@HdH*+Nbv@QfMLR$MOs$e)RD51Nc<`9P8IH%> z+3m;H!1W2Aj?TXn-lrg-W$&+!Z7lecHDBh@?9htSpIp9BbaP7h4_95!Esb^T8nn#T zaaP)i;2GN;cA=1BN8T5KbJpk!#BTZ&VN(u zocF_^UwUl!9oRJYo#Z=bifi6zd9RkAog(6uKnluY$5mZ$@-lu(slhG@8P7=UP!jll z*LInn;ZD0M-kH?p_g(Y)-m6~M$M)OE8-7_XE!xhi@@C zw#~1COV3H8uYcQq@94m39;yJZz%^s4dd3g3^S-q*cKhhO^h47t$7I#rSAO-w1Yh4K zcb;{6bvrq0Q_{)!UM-4jQuYs7QEFGPPqS>u-GM_D-9kX9qoY_sASP>YjU#DZ|H)aJ;(i!PDPrgDbSg-I0#n2ZwDd$UV0pU%kpU zeoR4v*Vb?CZpXSNHSgMe;4F1)(dX~Rp0qk>%Q{5Q@@>3e9;a_@`Iv70ufzI^ul`+5(b=B`;Ycljrg&x@Ws zzIo=IsN1`P_FH|}>htUCAMSbf;&S_4dzMcq{_RNekewlq_mn=ll(}c(U7LN8@75h# z^7Ks9@~8yWgkrnBs`mGwjC<{=- z@hE*ks|QC)jvx4?*`15^M^{|kdEkq$9k$N@u3J{0j8i+?B?Kl+O$=)KG_PG~)|U?= zy*qcC+q!UZ&kA>c@xK!3^Fw~#;fsNvtv)5R(bO4Hv03YH+?K8ycO`Pw#!khLw#=UD z_}p_*9pHHZPryTx>Z!;`Vzp@7b#t&k0HE5p^KuyNn^jx@?;F z#8cz-V5`@u?B3P4`z9{@vH5{TGk@PQAiPzZTl>nj@mP9s?)R>3U9-0>9=Uh!qFv3; zjy`PFHvID!)%JGY@uU0Xf)&gBR;RtU*1z6^!$tLvfBC%X4|kQlHq_PpzMzM{Z_~t` z|EPTBSk|GdHxF#jF4y_M*a{D#0!}pzi_PqF(d}OC-*(09Nlq`FwCUv1KmWkEu-bJ> z+x7cv}X z%r^;h_Rns1>rTHx+4BQ`8T9SE-H(G+0hhzQd&Tvee=#dRy|zuK{3owGCg0M0n*3+y zE?cVx1=lLhP1>-94NU8NZR)Rkx39Yy{##E)tD%EqT&D-N&t6yY(zzq!moC2I8n<4t z?or28Yje^*zdY;S!J;qD6|K&i6PMzfH~i~1cMjjF=GWWx#>z(L?qsL$9I)~7u@B#U zk`yqjOQo=P7naWczU2tVto1)dCnnZR|Lxk%Ct&pWI;*Y4QHc_S`f9Q9*^j`QlZ7;&jy?M?~Z&ur*@-XXWa zW|w2R^|Pm(^Eq%b_(Zu+VvE=P`fbH`w+)XEC{QYQ=6$m2-ttx6mCi1h-}S8P%~6#* zFX^85)2=>S3hS-?cukv1>#lbDuKUcCOVyX1*?VnTqo|7;I@fk+=YG3w)d8>ePb;yv z@{D4S@9Zu3x$;Lo6;+Nuy|Ohw-_e|yIy^071fLV-DP#5dHMe&luYn-`*k0rbCeCSd ze;l|!#9{iwX}hMJnvigMf2A5(bynv$ud`|byB;tp-N*B?=e^7A582oisHT4Qu=tCn zuQ%qFT>tR4#(l{;oBcPMM;%MQp4D{Eq{&C7eYU2CDrL;j_g9U({7vf44yRT%IT7l) zy7jjqAGwsDajE^zjvHh8o;u=mx^2tLVZD7Pt(iA0^@7);<(02Bh&%Jtz2k-Oo*U<` zJyQDh{*dF#+wYyUDX6HWa!B}xaRYws{ps2|HxqZ|uT5Kbw%W;WzAHH|&Wfg&1}+A( zqA8O&p347Z6Zkw~5`UBYhD!jgx!T$73vr!VJbAP#GxN+2r+I$A%s9E>tku+C>pM1x z@=f^tzT?IqRq*s)yB7~ASorag3VrHc2~A(;p=xyZqhU+-4*u@6<7ZxK+;?-& z$#XKp@4NM%7aP#d&$nYhaOk4p<^0>uUv_dDR9!JZAQ<{IcI-HC zRe$B6`O^3FGw50cyX|w_|=+DFN)(%C&jGQxMu`iy1D)Km~I=3Z?4FyH2)t- zcRTe+pVoK6&9&>Fytq}f;9Ov62dgRmUp^7$_qedIV$m(9keYWtPrAFj;m?)lXUwhs z+0VAVUu=z>Q~1^FkJUY+Rx}^c-8KB+*xtTBj5&I8R7p)t$#J(Qq1AiBX-XpTk-Tq>FFaDgmju{6EtB{-6eNCk}{o2tXrK5 z37UIg)4jmbruXu`%uMOO<#ATyqnbY&{_*Q`|6BF)^Xk1WpRI1JUR08KuYHGDLE(z` z5YpPv&{W94c7g`yD78t$i2$bkk-DWA=v}X?t=viVD>dwrr`8%~+G=O?E_4D7nE5SH&`@ zHF~(NQ2d&&kqt2n9|&X&+5$4d(0M%Q5NpjFS&g4{MWJ`4b4SR-_YZjn4>WUBUDzBQ zT0W4SaU`)`_)aAQKV_uvG_v_sJN_%;0oorvcEB(Cv+zm8NF9zi(E77<&_eMD+Ebv{ zXw%@vqxe39jgW}EG#r$_1e^LxbZUlKc)&{$mWL;_&N%i8Dn!O+hbh=g_Nm~5Jo>4f z0~1CMPENFqznWFEt9|^b?3~`}{v8%%Bs@#R?pfVY+tZMAjo+ST#nb{z%6Tz<2TW#% zFTaH11x@4Q6LBF@l@de!QNQF83my$Ahi-AXG5gZlnS>dLZClEbkZRK2p(^Rq-11Ba z>aXfge2se&S^(P-@0=m@@b9`fp(gVvwZW!BTI8VZX^u&cvia@Bc=;A8{`q0t48PgM ziCjgN8s0l@hDWKbXxoY7l2guST^q{@WM!F93JZF&qu8pWK1^OGestrc_tA|##x^N9 zWH zR>&9c=~JK_mlkFBR^W`TAm1yoalOJ`zPDjEtf!rPZ;K!IYjo~as8^$s^J$1E^p@}K z&}teF`QDyBhg8e*IFQVatx$_7pCf%HiF-+2d@v~xKmSZjfjb0hV|q=F*-Sy>GF`W# zhGo%0c}^2JZ5$s13I%*s06x;(kx8@|PO~yWQ<|Vzo1ocn+7H?~nsYo`PNUC3SeYy; z9a^E#g7c|4ZJQpSoe7$~2^#scBR;{RItqoB9FIKRkVcaRe#QG4UN#Vc?dF>>R;)E^qjQV`5Al(m+v3c$cUCM`TM9!eS~L#7V~vFhcL&IWk9Ofp&lOJ867#uqxK?SPT?Of zi+5J|5`#uz@lJ`a6Q~D@ch;;2_E$wIZJ}omE!`GhmeA+UB9{syD0!QBr^X%iWRlYs z^-boQQE%zV7Yj^|Ti+3jFM!cRp?h$`qh1wT9x5mlf}<=84n-HLNi zuj|Vn4R(W14b5rsARUBV1ynVb81z{fey*ea9R}zXV+2gGkW>xa_clw( z$fv@cc%{}hxjisva!l$f8C((KAm<*;F&%(8gdZZN12Eg`@JSBo0O4nGbO&JOa!eX% zGWf4~3DdC*)6oFakz?YAalE`E8b|Exj=+?zBupBpGVx6gHEKB=R`_Oi7(Yb$$^mOA z{}P_MXgOdF#gPY@c0&>x(uU)sTJac(wctoL8+jM-CfpM}Jz5BWgLi@RCgBLcP}2=V zQagT^gf|XVSfs**eG5*3MMH)rh!m;<*~%8;QU=X>YP-d#im8iOBf+1uC{PW}uU2Sl zN^Kz;rQ{u{Z zhzRcN{LP>(P=&=I;BLXl<0IV=_ctS$xgCR zJ{{#?M(W*^DuB~pRS}V!PisT|4Z2keJXNTgAnIoEYd+E8ifSe;q=409qr|Jp^)LX0 z@|doQwp88;V~=imwPE>GyuSGh8OlQoT?_*m{?+pJbkvj7{5$=>Y5{Ugnu=(dLW>hx zg3!`}mJ8&@G<1-=V!?~fL=J5F|9{Z`?~ooU=#7`*|No$TdVxnDE71obUWgh*Z$uwN z%Ktn3=Pf{wqJj-8zeI74nw+=!i}G2@gMk@!=FoqZfP)ljmk|Hyl;puo#KSe5QU7Za zh0CF(8{{)BpJ6$aGAJkBb3DqsCf?JfC4FC$-;x~KR4Qk5ua#4hS4t&*DV54esYL%j zl1lCWl3Tm5R8FsPJIMFA)v?>lQqevZQtnsC|EpB2rwmW@$Cp~av{2rl++WJ`zs3Jo z`kBlBC*{$#4`Z@@bm?fvGW$t%FRdKXy_Ej5c9Y5*rd|g1=;O-^BdGsIfjSl~4h;jU zVb`X8@<&Pgbf@+6@Cl9o*Ox*-`w|)a@e0=~5D{|L;zS6W5osRWiAZzdVMLk_e@CP_ zk>1PLA}WDFb0a?U;`3t|Qkom1k<$Dahm_{aE=cKtvM*A4fXqNjkB%dek__XK(mS5d zkV=8efy#-lL?vV&DckUxu+9Hd9?NAVOlv&W(?|P*@wiI=`>73{srvDM>O+)~c!J9W z#e4|Bf65`7k)3GvGS4aJkZwO~1;B$OYUsmdpnnrUJLhjBPXtXm|Ai}@?sEq@{z zz&zU<=SX!^`o@L+jg0?F{p3?`;z#6{*uiGeh&fw4e)PL=P~g`EJ^26hqHC5uGUEAz z6Wkx@mi&T(lu}*f|Lx#aec)}Gc;3x~w~b`<-^a#)mWJnYnID&b8O-&6l2>u=#JOd` zo=)=@qW=e#Y{cUkvo@f0gCA5vB)P~XW*{Qu3J3r-IvebG*;X}q_N@=BCVxq4B?|3Dx)z%rLCLB5~^o23cpF;Cs`>-wlz%2 z)_=ugScc@GAf==`=|Uj@k?^|F4eZkwCz6-ii|BMsa>t_ow#W7)wQgVZ+Oo{--UshFB2}H&a{O9=pNCPh*Yk;~9bHTR5pSQ z!I{N%-w~}afa`=PMJyNLp#rPPt3S%8a;fjWYWdVhmypmn$fFh``NjTE`uSJ;KlM{{ z{h!kQuKyE{FUtR?zf)`e_YYfzGm}`eYKx?2smb}6|E!v)Rrsbgn^uxV!9dE@R{ek5 zCwaJm!n+KI@?VlDTn@GU8l;PShWU`oAfFKDc$9Woh*Qu~eP7bNMRKTpF`rRfEvG22 z=!^WKFXj_{k^cXPZ`l6Nxz@|8wEku2BPK>0M-=*bUPfaId|Ly*O3>SLL;o4A3BYei z*T%UWB3qS0e+V<3?Q@aS`ijFU|hbF&RPeVSD{(3&GRJnZ_ z*4L~YB7T)xE-^0nv?3M`>e$v&Va+4b$VaoW%afP={Mvs6` z>+~4-v{p}mPwVwG_@s$m@M*o?A3lx$%-V{rt$)ns2&A!w09W8|lJDcPT_t`tjPPRn z56K;xTUb<(Rg_<#{4XDIT!t(OA3q>xYlNh137j+TDTs=dAFkE;btC87#jmZA@?`vz z@n<{yTqg<~r0X8i7|u6?U%mO&30Dc*#`FBZDPg#S`4RjIHX9`}_72uoWf`em{&RE> zwnd8%@vS7WSoP&%rI*L3lm|$y8gE>>PA)yEh;Eu+f?Dh%1?lip=^DC;(h04$QQZZZ z)uousC4mfvWeJ)zmQ9dB&2IvY^lxV*1EI-re@L2<=+sD{JD8+XA2HS>;YXOEyP2Q| zVRav6q)94Q!lF&m8Eaz#M{X8}#sgDwnk!d|duwC<91HlZOz@NZ5hmr=Scrk1CD5no zRyNgN%vq*h|JtGLUwRg9K-bu$9$iOH9eND(pt1bFp?k_}VVuQC=)KCjK~RGRp)C>U z70iR4@_HD1v4f#W%Sci6@2$(=i9s3L8zMtUsBV75Jmn1_3MOJ*4g(a<7Rdrx6UH)? zU<_39;xm;k)ls!PT7q}5H;=?*Dm~>PEC466>gEen>ShX5>g9-LL9B&-VGu$KugmH2;c6Ij8#|%IOdP zJ9I)dh5tX9F5&AOeSLb1dZ3|(4tag9e`9*E8G4`@dWac%9W(UCX6Qj?==IFd?ak25 z$zu*boa4}nklTqyKb~gjf;`6jf;`4_A2T>%X6O-|?v43|%kzY{7A``6p&cYs_Ds7@ zoPLHSBZ!5%z)w5SI&>_Q1v>3WtLaJvu|PJU8}vuoHRJpm{RnnKEA&TI1R)**4z0`| z;_iSM;LvWkK8|2lN|AmB%R$ygBfmEWY|d|>2XD+8rs&8h(BF4)nQuSep2^+0KD{*b z0R#5d-&>!_BRRdUNH>s^MkWU)$`sw$PTH8U2Rk$L z=4R-xYi~_C4&5SGFWQTm*>!D^>w~K%SYc${&=pY)<8*+Kj ztWmBmG0GSvlj_Q&Ls#S581k#>_MDD#qg(_WHQiCHuZV9%*XOrEbz)^Gx0S0imq$~s zhOUS2uPIk5jbSmk#TMk((&=VTOApZSo1-hGOsVDf)$pt3RO4&uUV3_~#`)2XQFP-E zeX8Zx($)NGx*z99?-2E)#@EvI%dLjxN~{dfW1L+erw+bI*T=Wj$RpL$o0hIGr=5o1 zES-i5O}ScrrCxh!>@dm&TF}ZV*c-PKfv#t7MEBC;7vwayD=pnreL26EZn--AX6S1B zSGS8$FXM8xbXPqbE!{Qk?u3iUF^aT0M%)(hjO zLAipQMAt7@t2Z-xFo^@b8Q^H}Tj|$V2j4`y6OO+9X!NOLCu0Z~U#OT9jvVO`x znvGQiv$1+~3DTt4y>#O{tP~S(-kfmnFE!49x#9IP(9Z2^l|Wm(7Bl!8)S*2xNO&Dc zI2=`C9gM~Af@A^QkeBK!G0s41Ws4bV8%Wa?86>!G=4ghADY}V<^+@H3)D|S$!ten) z^)Td3dkx-nJzhjC;P!Y8-mKT)r8gJMwUJ@nhP(zZJ^O!E-2B(z9d4F)uG9+yz7vx) z!7fNcrewizEiz@(r>N31mMkckpu|A)o}vjHFw}=c?pfu8O)T>{h>@UOEJG8lA+)ze z=q6kQf_AkG9c}{J*CKSd2D-Xs=m-wU9cNp-ovxxJ78Kh14bJX0K%-NL0T zNy^iJ-5Kx65j&-dSsH4ykl`3+anWQEjl>ZzsA@_fgD}kEs>vcYz9aL~W}${Q%u-#G zMQl_XyoM`bl6$@1Q`FM0g`^H%in!NXkROZ5QU)y=C`1E_o=C^1XV zmC9LQslr(KQU#PhdB)54S7i$sX>$isjO}SGg$JY<+f!h(#U3TvsC{0`zDAMFMe24n@37_a|)^#SDdsuV`6M4`wUEYcW)x|$(`ml1^6 zSc5e;hM=x!2oYceA$G|ccyMYY1&ytS5Wz+e;&@tvwKRsH zG1L$u%m_jpH*HxfGI#0h;3Ok+m(+#1Q;MK@Th^Lb=g#`8s}ZZT23RRYWNjm`s!XuD zaaNU@RnDSIZH-MxY6}zkz4zX-dml_H)*VA^Sqwqn%KLVXu@rWIrWBH5rlJQNg@j`^ zJQtj4EDP_4=P?!Dl`g{j=@d$Y>yI~Q=-ufic;J)Eit(m&kq$=!XaiXeXkoD7z7o3U zoQ%orI5#S5mYSnd6@@Lr=(IF>okZ zV^w9+`EefT_>$A(=8skke366_S10XD1EsLfgVdINKU~1Ety7%)of%w)9RrT79GW`2 z`HU%rU~_t_`3wr$2pA{le7HbS)icQ!Z~t*nBD7{ASRhkWh0$Fi2e8E_8zOQb<}gYT z@dC&W6louoRb!H%fr^2|*Rn66`Li8KE_sqZemxg<4PYKs)>t~K+6>;Va!h+r!lRW* z+9)de=lcoo`p$Tq$}7q;Bl{)1>jC@Y8Xh+~J>y*Q<+nJ2bgd;+F>mz0WPD{pFUoC& zUjW|~Z=8P*e?RUkKHO zy;X;w(Kdf*k!omBW?IQGRblUtQA6@Rn{#x~fl%jmk0-yJcw%d1!4CgbmEW)EIC5;z zscN-;-W)t=)}#pABbP?r`6_vbBDko5bHDEwj_$T$*0tqMwdVejcDq}joXP#iUR$&7 z;j?=IJ1YXil4TS9K6_|8w@*by`t^Hmp#cj&NxQwYd8=A;^JX>p_(vO`lH9R%-@fkA zvU>Trm?<~5`rn)W=wOE>za2a=;%T6Le8uv&CLV4aI_=P=rGVe5lQ!aks)RZT-IAwY%foa@$O-S$RwzzPDH3N727DzGgG1&PzC5#Yc1W#|`P;T+-PpT68cMCg(n4QVtIn;ySq>F7Ln4p*J|&c@3JdpLtOupN1RV}YIh-`pU?Q!bB1SD)L*c)_T^>?rysee zR7CdOFl)_`sxJj=d@rXUN{M51w71ys#jQswR+u6mP9eV~Xv2mQHIu`Qowg+Q^R@YhcLx;Lw z2jyKkRO80&QMHb2nNj^x$HRqP$2K@Sd-D1(e^Q?Nve8+u`$0eT+3qu_by@rLTc;lf zTy6JjBVRjdlxg9A@jbrmE?!4%hOJrZ2s&a5RR|-o@AOQ}uM_FKyXLL&J?`wD)Bo27 zO}uTkwz=wC>>A%`THQ~351Q{Xa=S91<&GLhHpjfZBKKtHw=cfs|ATdh(mtm$uQhA8 zSo+kyUO{@Jlof*x9rg-3;;fKoOK1B#x~Kx~Jt+)&zHVpzal@?c9!dkyo~M**7w9vWLRI ze&Fg+_39)Iw)48NqVx8V({m0@sU26`WPi0)_q+P|w7T`A+l!m&#T(O3BxS{4x6U{) zba|EC&i%?ILvJ@Pi3ssqUs31LjXt+CWovpJdX({Ez}}vJon~(GO{bQW-Tq?prHl8Q z+I=SZHoC=_$8YYwyJ&Lc^Zbp&FAiQa-hN~3_Nu=;#)aOBa|_;Oef`Nd9((%a4;k^R zd!LB~V+tKFt-bf?mtb&(HN0Kq*n3FCww+~X=gqcVX_GW+XV>~$w%Xn7?3UKHXYWDN zY&&27CkogscDjA^%{@T}WbeQ6$(42Y z_da=cq08>QOUFL`Ty(uckM?F`Lq0Li|J1jTn~L0dG(;wGwhAWwMSZCerM6qcOT@;d*j}br{5j?DfU)n z(~&h-bszNX3x_Rpzv@+-op*9qV%NZ~lTw3PKboExR{Yt$HeTI(&FWCTuy6I-Klxp3 z4z%=KVEfG(oxyCux4zBFKaAbIr?Iol^eP}ez1AQB*(YcOnk0LZ8W{&M8b-L z*9#`O4zhmke5A5nLDbE+r~YbhyKrWxs!#O6xUcet4)3vX&ciy&`uDcfKUvbR!FHe2 z`N!KHTrl;{=G@3PI^Njt)X`&c<*cvWI=Pi>TUfMj)`Hz_&x|}Q>lFFPGtYh9cN}-0 zuygqm-&Lx&*Z76sJAA$Acc1-L@B7>Gto2Qlcjoo+^J$&B>yO$Oj}{-gbnW2w5~uD5 z->QBu+W%zhh|c-hl{J11{$+RE-t?TR@f%Mp{_}T?4y)WIc3O9!@3^byZr<;I?YGf! z{`J0X{`Hi&W#v{8%ZIUv-zH_Y7+zBEXul_Gikl?#z2ZG{%Zx({pHDhGs@6(}r29=X zn@^3u(!#aRH}W4n9&I|kZU5<>1qb&(Ki6~Jr*#H|cuJ34AN6I|nFnUX-ncbjaLL@j zp9XK8v*))Eh5v;}udIXtb1REy=LB1KoBi;G$AlZokJA6_-eXI>ppZt7%hJ|wW`k7S zFHib;-}bfFB7f;CePh^=IJYT*T}sy0Jb(7cn8gb(x+ScWu6>ZQa!sk~lMB;+{pR|o zXRog+o|%y0Gri!8j<*iq^7QTJc6CLIv$slecI9rkaP<8*AExrpG>&G}U`zHV3O zSiJ6snAFsOoL@dHdVZr=*2y=f=b>fgck8wBt$k)@vR_7ggHcawbXc1Iq|CqbH=xP(43k;B%)5u7kG>3M}<uxi)GEBAg77P_a#;CD(ryaGI~M5Q>M zb69&e@#uy*g_V^fjyFr06CPi9K0LTv*WRbs_dDlM)@+mO(Xyr`6VG}dJP~rtX<6sT zYk%Ha^UZAqN&Y+K@?F!Ht^9TAO0QaH=FRPS#_igO+T9oRp8mt`?9JujYd&1vvDVs4 zy}s%_HRF7PC8zgYp4=k3a((w;heY?Ao$BSjI57FCy{t|&`|Z}goj=z8Aa1qmxai9Y zr}(yGeFIc&7vFn{XI;kAxZ}y$%eG=-sDruB&tQTOrgT1K=*)5IDL&C|f2iA}#}h^> z^7BvcaGvA))4M0upOH=axv68bXrHck?mBJ=QiM#&+Osfs=lleuTP49NZ5h`C%;Z}mze_SxOfdGuLUdtUOQsxMwdc}yMHxW0SumtA8E z&ri1UU-8X%mm4fzn;`!-W5Jn)%o?w|M{4ym3>$%c?GW zQ9X{HTAMxS)V}aOl=&%t*ak)c5 zOlg-IpOC=14b3f36;dcZKYPRw?DZsd8-{(aPWk#VtH9b2q&@RtYNBx)ZDjJETLUmTDuh1 zr63phSw*?|Ls@c{l(dxCj%mOy%+DLaY0W}IM}>!mvP4z?+$`F0!q+Wfp`j5W5s{Ih znW33t`rql$QabHmbdQKnG}R^_VSmjQ^C_i~JB+hp<*?Rv6{n*`U&5APyL*Yj?5$g( zyh4n1!z`kJ-f6dvVZMmvuW?ZvPo>ypX)K>*C{CY;mb$jn#AV=&sjiL7F>5Th*T$`} zgzIakjoV-sRH+kJpj@Rwn{JDGm3wL9c35vHJ+yIq+QPEc%Hu#XJI10E#^raUPiPUR zS&`&*A_ak;A5z3{(CS3^bXOszcWUXqtT!kFi;+}gM3ZpZXs-HlNgSt9%^jIYYs+ae z6EwLAnw1HfHK%>AE+d}f*>GA8r-`yCbZF(0cAU?a)3)jH*_oi(o1jq}I^u&|s&BdE z4UR`^G(#GFxa-ISSwucszd5o?eDx^GM;c`83%*z&+6%rylrmwlv4?MFVM~&A)j3nZ zLwuy?_P8>2Ovc7=v_0JNWhY&_al;I+X+32G)GRe@M3R)Yc(wN3|awZtn$XbgY2 zK)h0fbdm5Z8+l1!AyvU9U>!M0jYMtQf!mV|_CoeeGDR(rrz_%!UuJ+N<7o8yypXDo zM%K`guQ~U?7Ujr286SL3#wpYa56amTb-Dx6saEf@scKosZaShz5H`IED8t^Sa0
ea*P+a7gHfk#PX7XqFwV$|n^Ja(7`NK<6jdHBnR`d(^xL zZCi}|qye(&BuFmU1=-|C{J9dHLT(4-E>Wk`2uW7;78|Y3O}#yde~&_CI~wJ7pOuosF|U%HD%AX#~k-gVd)A z_fabR5tALOz}p_v&?RFe{%H43kgp9+f7G}aS}Bpoh*Foek-GBxHVKP?46Wb>!Ij}o zwM=iW8-zbWtHxv!2uO1P-OkADuCo>rKL}L~LfUa3|HS|mkP-yn1_D!@+MU8Qu#is! z0r_&A%E2sx#5Wx|2`z`=B+zij1*= zikfg7h+lA{OZT6$c*b%Rt>AQ%c$m*O2$627p5lRri7iqurH5lQ3ga$E5o0O8GX@sj z{I-VqGjX5(H!@U1`|DyD$nfvx57()lx|%eQt$`uZ*Kf3qL5E?O228y_|1iPxujCC= z;}CvgZgxR_Vg7(3WxG+?syyC>SWZ#YU-ynlVvt_C+2gox#WzBDwO6|MKXOQdMF@wX zuO?gc%>920=|y_>*x4l^b)4tU$N#qkJ>38sVpayUa+uE;I2wJ)lGac@xJ_^*&n`Hc zmJY+wG;{`zbafeyCi+`&v}$<(M^p6^IBuf=qtRXgpKKD}{_v@)7JM3BmGEg}#2-HC zFBCpKZjORaPw8Ud)8yCzK24b!@J+Qf<^W8i+59~U75@jo*ZV)ZD4eF-B&;pUAA-rY3#Q*e0`WDj^e-@C+2p@U)`nope-*}842c3i`)J?{L4;Z4~jG&EePt_*emxZD8)qWD0;hrbYB S{g5d3u=(f1&6fS2NccZFn6SYB From 07fd53a6aa53b198eeefa5eaa8f1462c0da6ba91 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 7 Aug 2020 17:00:20 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 2 +- .../Admin/Controller/CompanyStatementController.class.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 6822c9809..b3c916331 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2087,7 +2087,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['receive_company']['bank_account']."\t");//银行账号 $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['receive_company']['opening_bank']);//开户行 - $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$statement_begin_time}-{$statement_end_time}"; + $fileName = "{$data['company_name']}&{$data['my_company']}-对账单{$statement_begin_time}-{$statement_end_time}"; // dd($fileName); ob_end_clean();//清除缓冲区,避免乱码 header('pragma:public'); diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index e727fe19d..88586be60 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -441,6 +441,11 @@ class CompanyStatementController extends ThinkController $data['receive_company']['invoice_type']="普票"; } if ($data['company_belong'] == 9) {//上游 + if($data['company_name'] == $data['first_party_info']['partner']){ + $data['my_company'] = $data['second_party_info']['partner']; + }else{ + $data['my_company'] = $data['first_party_info']['partner']; + } excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_sum_money); } else { //下游 From 82787ca561c9b6ca0cfee55d967fabbca2293c21 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 7 Aug 2020 17:15:45 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 9 +++++---- Public/Admin/excel/up_stream.xls | Bin 21504 -> 20992 bytes 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index b3c916331..825ea9ac0 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1897,7 +1897,8 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ $objPHPExcel->getActiveSheet()->setCellValue('C7', "支付给:".$data['receive_company']['partner']); //增加支付给对应公司 $line = 10; //记录统计项目 - $pay_amount_str = "="; + $pay_amount_str = "=SUM(J10:"; + $plat_amount_str = "=SUM(E10:"; //增加结算记录 foreach ($data['statement_info'] as $key => $value) { $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1)->mergeCells("J$line:K$line"); @@ -1946,16 +1947,16 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ $objPHPExcel->getActiveSheet()->setCellValue('J'.$line, "=E{$line}*(1-H{$line})*F{$line}*(1-I{$line})"); } } - $pay_amount_str .= "J{$line}+"; + $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, $product_name); $line++; } //合计 - $objPHPExcel->getActiveSheet()->setCellValue("E" . ($line), $data['pay_amount']); + $objPHPExcel->getActiveSheet()->setCellValue("E" . ($line), $plat_amount_str."E".($line-1).")"); // $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line), $data['statement_money']); - $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line), trim($pay_amount_str,"+")); + $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line), $pay_amount_str."J".($line-1).")"); // $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+1), $big_all_sum_money); //本月分成总金额(人民币大写) $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+1), "=J{$line}"); //本月分成总金额(人民币大写) diff --git a/Public/Admin/excel/up_stream.xls b/Public/Admin/excel/up_stream.xls index 467e8cac24ac89d79ac2abb4d16f28c25eae5a48..cfcba995d4d73fbe85fcab9a226083578abe76a7 100644 GIT binary patch delta 1487 zcmZux-EUK682`QJoVMqje$bY+YiGN50&@{{EE3HUR=YUa7zKtOL%>ZoL~u+uC*bA= zt&R`n%JeakU_xT#f_On(4i_Zq#s$VpZ-|M+sDA;O$w-V}^LgKMS{GxVyyrY0zu)h9 zKhE3AHBq@LKHMf+7P`I_ViWna+3eq|tE+Ns0I-oqD-RhzB;N~r4~wcX9^P{AVD<9& z_u@fLR%pg3Yrl2T@5UK1MKiwR^|FFFzxoooh|$khBemKoYPOPe+iIdgdkcMRrO40Y ziXElLER%k+9-+^3aqfBez)?! zpaGlcb}V1~Pcp@T{{uJG@^>)6ZVqroHqc6}U9`}~czZ{-hWRKKTgolvU?f$e^qTyo z;H6+K-$-ZUy*u)?>KzhJ!H)@8mH2k6txycp)^W^qV8 zkH{xo%Vuaf8xBH6Be~!Jiw=3D0EV%yjxuo?{6%^-i=$YbW8;ikn#pZn=5Jzz zmna*Xytq-`M3;5cWbsjk$l1%HY%t7k7iyu5xF>0Hy`m;$@{Vm+2#cAAv0ky`yk9zA zSz}T=!&wXO(%q+W?e8g$&732Aab(9hYwCD)jY-Y}oV74dZN=vDS;Yx5=P2YiD>o#_ zoMUQnd6>D% z& zT2%XzfkETy{L=l4PPXrcMnClbK|k)y&}1n}%R5cVmnzP!Qc=*&U2W7hkgD!JA>wp$ hciAuJwIXPwr=NQEeC4Zrx37BHd1l~CohEyV{{TK!E~5Yd delta 1559 zcmZ`(U2Icj7=FKVPTO-%e{8$1wA<-gCVv6VvPd+%VO4%v|X zNIN!EP|4Dl$YKb=#0%v@V-8-Sz>WA5FNv3iOXG!!$@GFm=JS31kwopAbNc=~&+~ro z_w{S>V^RD>th9;dFWSEqVhek;c`jzn`g`l^>zjyZGoGz@WW3E?%#Mqakq^?$nZeck zPvSvTZt|>A(1tqru5nV7c-AvnD=V1$yQf~~Q)ZM`EH6K5#d+CoV6PS9r|bkb+YWzV zB{*cqxzB3gpRI@Z2y#uxb=WaJWbNcjc9=&jlW$pJ_cQynS8U{+k)B)wn*XsLCR&4| zJ~uOWC`KFL|5rZqKlv1&k7UBPX&>ro%%en-ycTH@4ZJDZ(z>NeJRgbNNZ&}45my*F zy=sK~1^)$qHIE6SJvpaZy-f$;w`iE92T9QiS}t1g?}SY5yF1%DwD z;n74rFT}Uzw_+2e+Q!5=65CEbx)0wHZBIE@n_)4-R_3vu5Tm@?*55#-i zV8cb>Jx9krTwdbO8^7jNXGjclm$O5Rs`r?D^K{DLJ5E?kAZp~5R9MXLM=3`vD$El9 zn%W_j-FTCc6fk}B z&5CEy$%l;Y$iordUuvS&$J5jCml1MWHU16Pi8dY%G>T4>NP1#6Lq zMks_x4(x;INQLC1QF@?;GHH?UORm%`M3EZDrc-J(6KxOD7#+fhvayNb#<7WI)`SW1 zaX{qiWl=U5#djHM(Go=~k|yfQYC$G;tXm;0FkhfL#g1aXbUJ*WNo@yNi%#?0?sUsr zierQGA}*Zl7=@-z6Ze_qG$L!!+x*?`roual;|J#@l6OFEh##Dn)o{2xbVOPC-27Po zBu=4;R^t Date: Fri, 7 Aug 2020 17:30:41 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 10 +++++----- .../CompanyStatementController.class.php | 11 ++++++----- Public/Admin/excel/down_stream.xls | Bin 35328 -> 26624 bytes 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 825ea9ac0..5a5f262ec 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1974,7 +1974,7 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ $statement_begin_time = date('Y.m.d', $data['statement_begin_time']);//对账开始时间 $statement_end_time = date('Y.m.d',$data['statement_end_time']);//对账截止时间 - $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$statement_begin_time}-{$statement_end_time}"; + $fileName = "{$data['company_name']}&{$data['my_company']}-对账单{$statement_begin_time}-{$statement_end_time}"; ob_end_clean();//清除缓冲区,避免乱码 header('pragma:public'); @@ -2013,7 +2013,8 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $line = 3; - $pay_amount_str = "="; + $pay_amount_str = "=SUM(F3:"; + $plat_amount_str = "=SUM(C3:"; foreach ($data['statement_info'] as $key => $value) { $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1); $objPHPExcel->getActiveSheet()->removeConditionalStyles(); @@ -2061,12 +2062,11 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $objPHPExcel->getActiveSheet()->setCellValue('F'.$line,"=C{$line}*D{$line}*(1-E{$line})"); } $objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name); - $pay_amount_str .= "F{$line}+"; $line++; } - $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $data['pay_amount']);//合计-平台总额 - $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), trim($pay_amount_str,"+"));//合计-结算金额 + $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $plat_amount_str."C".($line-1).")");//合计-平台总额 + $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $pay_amount_str."F".($line-1).")");//合计-结算金额 // $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+1), $big_all_sum_money);//大写支付结算金额 diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 88586be60..991faac34 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -440,12 +440,13 @@ class CompanyStatementController extends ThinkController } else{ $data['receive_company']['invoice_type']="普票"; } + if($data['company_name'] == $data['first_party_info']['partner']){ + $data['my_company'] = $data['second_party_info']['partner']; + }else{ + $data['my_company'] = $data['first_party_info']['partner']; + } + if ($data['company_belong'] == 9) {//上游 - if($data['company_name'] == $data['first_party_info']['partner']){ - $data['my_company'] = $data['second_party_info']['partner']; - }else{ - $data['my_company'] = $data['first_party_info']['partner']; - } excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_sum_money); } else { //下游 diff --git a/Public/Admin/excel/down_stream.xls b/Public/Admin/excel/down_stream.xls index 49582ce0dd5b04787c03cec26ac12c6a501d1b1a..a8539a39d424c040e78dcfb0f96a69afd2d9569a 100644 GIT binary patch literal 26624 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 L!2b#Vdm8u;YJC0s literal 35328 zcmeHw2Ut|e(rC{xz#v%>0To9?Br{|b5hSQ63|VDS2{MEgK>^b$iV7+sikKC3O>5W{ z71o@?8qqc9HS4<9?A?{sU7c5T&g416o%!B<-@E^RIrH_L)78~g)z#JA)nU$D{Mr1$ znjJO|iPF`J=#VcW1EMDfXTfurByL6^T_nP&5x;HVW?m^&Lc76I0W2c3NT|uK>tRAm3ni2!&TgecMsrCh*N7yQw_4 zDTpVrAa?;%)bwAB~PC{Vsw#c50a25$>7T}GSbZMeEIwkv*mOFacvbbl&DZ>{=}Jh5t7OS>driheJU?d92LtW1K7FQQIU{T zo-N0nIKc<9%I9XUYu0{1_XkGWla5u3$zUxQwgq=uMD7+ z(*|t1EesX*bRnGrhd7F#hd9}CI)T1zNk~d~s9?-U zuc0aSZUKCsp?!tET>$OEyoDDSbedGSl?W-6I?C= z_4NRnBVK=qU}%a3;f@z2UIVMfSx6)X485GcZb$Lj)Qn{R#SXc;akF zse!Lh1K*|w{(~C$N;U9GHE?zEsH5MYhR!NAaBbyTuZGSJHSixPxDgDsRD1c8t}bvI zDYywlDfsV-a8n8VDv5>1P7-`H0}7vp8%p5jGB^(&Av;Z93Rj}vT7oaNAKFgTwO<&j zfG?7kT+O$43qWHk7j(fiT*{ZWL+HUI-&O&qZC5B53 z31=~-XBbXt{DoOrhdUkaL^!)CIED|`l|5RYT$d-z-jwe zr9<1lDtsqJM`~BK=H`}$mQXLtDR^g)lj`5Fg76aeZ!{c$N^m+NQ_%b?*`j^33O7yWFp%-G%!wz;c z@Bp4dJ;G`L(1G%fXM;6>J&4<*0R;!WjVEg0JOwyyC#rf=XAfN|`jj2Ar2T*x-cwfZleiXS5>~wQ8bwZ)7VRqGI+79vI3loMX~=?FK7oix z;_Ry8vb4a(6%bA7g3qimE=LPoT`h2NkyKN8^|ipITc2k7rCX$CxG*)+SYB{}G{(hI zNK-waC#@+idU2ZKqGzWLx3`l0qPM3**)MHHvU!{dEFZ9OT||cnv(Ri{(hk#d9K&1KFK}TN$BF)zhPctIT*ABWw8c3p8JIW(7?bkAo25w5dAo})fX)lO9 zp=1=tUXZ2QO6LHXlh_VqXm%kejQD1(xYWW?d zT+vafC3;e~M>=d^g6Px*k*xg6HRJ>s>c%N$TxTtCU9`Y;mEvM0qE{fPdDTL@K`L#Q zST@*AVJ`H^H}Zu}QZhAn$jOnK8oGoMhLq;?87xQMnqd5;E>-UmR(3VkCchcn`APzN z0zn4}u76Mf?Wy%zhL|`n0GR!~@2I$n)iUC%_RTjz%aA~2i+VE1) zBDyWeY{P~PDnbPZ2dfAr50eOmFp4sKNraMzm2j0?kvCw{tw>T(1))?k_$XumZi)t_ zYJt9xL1uv}bs^EQsFWowwyL4{0TE4`oqsd9%3ffAf^fBilu9G16VZ!WIpLHmwmT4! zSsUtGL5C6|Ox7k}i4sl7!!)m0WubZ~2{o2kC{g1wY03WmO+dLv43t(4HUXTYNHnEt zH$5R$HlRX8iYx7|kx26+O^{|pn)g(CX-1@ZPbFA0BF%d$A(|0s-c#wV84*QKWsXu0 z8wy19q&+M|q~;|tcaf-31k3xBGa<38`ucj2q=%K5yF5%{?ot?Jm-J)uFx3ts3@|nA zAi}l4jnD$Oj~2LnwZQGC1#YAkxc#-j9iRnnloq(rTHp$_z>U!YH&zSWI4yAFwZKi# z0yj|$+$1e<2Wo*kNDJJ-THq#Yf%}yfxWlx-P1OQ7O$*#~EpRimz#XmyZl)HvLM?E! zw7|{Q0yjqs+*~bizt#eGgci7YTHub<0ykd^+yb?@3t$h-3`SIz7o2|SN_fN#Lddwn zX*}3)sp0m80C~k1i(@Nl1?QktG0`z&!6`g_jxg))vv(q0d}dMEL|t(S7WtSn^YLQf zW5>t`=SyNfy27mYckeLsY0b>Xn}Lr5BOjasiTUUWvtGQr$IPb+^57 znE6;DA0GxQQnj~Ez=sJ_%7@b!wWsk3GoNzInz1XFM+jv7m0VWU%I2{o3o7O;(pJuGujdFgRF zNGZRWh(qPaRJ2`X8f<-H0)sUnF;fphA&_EM8AY^MWs2rfinNugp(qO8co>IEr05`{ zh_AJX(2@C%y6+YwcfY_4(wUrX6VFx7w1S&0H*og{UcaUTQ;v&?A6H1PW zJn)}txXub$0S6?Pq%vi9mSsn=)n~`1pv=7;90oU_xu=o@l0$^>DW?28)S_4c)J+7x z6hk=_@l;82h-)bqRN$zPpT*{ak(XC}S-1gaAha0zxElfGL)E*X>PwPURc`~TFM)|3 z?L45mar;54L)fDbtKNXPW25Pt7nr8vEa+H+{xJoY04ZaVcR=;z44wsxvoiD71JmLV zk5Uel$40R{x*QN`p`o{0*FfEVvr2M`;jcp<@zR=$J$nI)<`%qb!dr&d%?a zHdE-DUBku61*IwKi^cW@ezJ5)Hl03qmu>s_dUgQ&H*w*oM%IB&qT=Ku(DT znG#==1x-|aPU|~{@S+(4hbwZ0KM}SRme5~y}uuNxbpR)vaw1%7wkrql2WSs?um9Mn-&Ku z65(`&YL=u*>OwZU!c-WlUfPauI0%x_!{I=gUS}yid6y8*P{&47I#Hq5OGXceT4j1& zrS#-oKSEaQPiCeUETe}*gfcxRDLr`?kC4*LwaoNFWb|AQpBcy3@A0~PR1b?NWjs01-6MP1iKA!UyVB% zlCBwdA!JQ~j!BvV9g{Q#IyRTYrkl8_@57JDt{T9M^)6zO4)-UwR0Z^nYGx6Pl9=_<{FO@`Nm!f{{B8pX@QAw4no5}Qc?fR`=p5aW zmqDH$fDR6Ze)99Y9`Kt#Da9ZnVeSm2lW=z-!dZJqp&SMxXK)%l!F!R2Qqp+{i%*`hxpoosta&mnM{E7-YvTMy&x(vH)?QAc>`aP1+~00q=;_v^Yp0NB~H22rS&5^^R? zoKy)BKwUMsXROILZ3K>E5Da>4s_dI5jLRJ1P}PJ?{4-ET#)(u;hboLTB~T)fRR4^q zSvI1z9H{N*d8X-=f(c7eM=hWKJPmk4J9{utv9fn&3-PlYCl(HVY1emugBM0!ImLkyq) z^Gg5UCy^J_cg4uF3D}QdZ*Vi=_pGxC+(e^9etf6wSCc1CG!ivcj;flIf+;Zxb(JQG zRdHDVToGb9XUC@w&uOZhmi0ksESOq>^-kBVf#|?iCs zVxNG;H%<=7VezrW?-MjtqEn-r|5dJ$$U-2WVl4Pv+CyNJNCf)?#)*ScaH-WtOzFWl zO_kU;IM$*AfCGh%Za=olO>V zos1UCrC>tr03D76_|XXNOn$p(dKlbm(gEfKZQz~~R*+vT%r8z&oG?mQG}L|k$h;rs zpA#JCn?*GB`+NFRxBj*DA>6LNO*=LB)Y?f$PA{{!Jae;tW71zuQI``#H}NdE5KGenjMf<)(H{AD+xwUm*#Z()sp6MG*m;S!*&;dvPnWd2x z%i}jpd^RdOsy=9Lbz!IK^_M>du+RC9btwH@YI1%|++C{|74rigp9#D1RA<-rj)Q|< zKmEAW{!#Uh`-1%hKlBgdPH#9;bM@t>kA2QqhPt2K+wBkc^)3}_&L!y zDJfGxBO>s$74@~@`o>?6fS&w7?=Z0^sfEJ4A`f@`E}QrB*T?xrGvAaSoPMb!?(%V~ zu46qmREK%2Du6YknwSD&6c&jr%R<*ewdAcaBq|3GH@~u06 z;a%V9a;@_l*I$P1wf{P(vhSehSDKt2MZ9ovXvGd-7JmJ_n!Gh|Y_bmKq1YPa#HNej ziDJJ@zF*MZx5JdakEU#YT{7ab!_Wk`mCJpS(_akqy>-!cWo6N?KaJ~kOR)by^qt4{ z_9sFn_6|MpwzM>I1*i4n)oX_580CuCsdvULDJoj?YT(q;h@=G#!C$_7nf!U@n@1Z0 z&BOi*?|1g`cY}gb-t z-L$k4*Bhg+7%u96eaYhWrpE`b`qiK!J^w^RS=*ko({df(vMyHLyj-}UexF6U%|yqO z=G6y#*~G2>_SfJqzrX*!@8P>8WXiohC)XV>jr(D}?b~I~b4^Yp=WIVdI;qQ(#9hlm z{#xoAl;;0LzofA5gjwmE)7Ji$)Oaf8_MSauH?BlPxeZPke8YEj@z8x~0mJ-yM(|HB z8@PYx$?~nWhgf{yc`u54yb}0s%qBORdMCIHn4h(E|G<$#A4A?>MXSc{kKcB6$fT)X z&ek?o4g5Z-V151IwR)LTu0MM_V$rqR&+4c9^D4Lf{BXq9^J6DoJKDbbr)?J=?r&%F zy>GjMkk0GgjW^la@%F3lt`?o1)$l6*Pn#n*oSi1kn3i*T-GBzGcZ1z#@8sTpw$_js zXAZt(wK+Gm&&`=>`HypWj@OOe_BdK@9r)zj-p=O@BU3Mi`yMoHV^ra}uIbaQ-P=|N z^@h;vK-2GU@0reQdeiCNU-vE-TIN3vaCD#a#~=t9sK3hZ;#u}>oxh~`Qxqs{O-tfy8|&@>@N8hmVOw|*=K!xPtAg< z0l&Jz=Y7kN58`oO>E@%WdMJ09P@U_W)sGTjZs{~Ft`gXcKwxou7Q zMOj=fniSQqV(f0mF)#Opl^pHb$*H(t$c9DchpwN1YU=m6M&+tqbxJH7{R&bkZL z{gQV*+ebgM=)j>Cg|g-^El9Nb-IoO83h_rVLbL6MWq z288~(+1uJGU{6R|gPuWMueHuE%LAq!I{1%VyQxu;`mMVTIX2;v(UQy8$3OqPC}`yM zKf0e7Xi{;_q|@z(ZG&n%`WJfj*>a>d*Sn9)@*|PUwhrl6F)hE~*biIEdwA~NVt(Et zVrEKRz2A=ROQxSGx|YV@?NIE;{nUB;d*|9Oz9RzOr1hC``}Os{%TngFyKp(e>qJ=1 zr+zPj-mKd)I^NQyXm(Ce9{+j6W6yyuqekS^7aVgy2itF1D`o{5y}q%g)hDCPW$jH9%zxJz@^kKp z6;8VYHbxFQVBsAQI5)ZVqaW}7!{WTxtz*%>&kFf5y6-}E$KR?d+&Ji`^?zG$jyHNN zTIT#s@Kl#si`IN7HC=Lo-DRay^gP41g_}Yn`+cq}J$dx1$t=q~kIHko&U?1_-JkaI zMZt=q#WNyD1VnBLvf=ek4~}2M%WQYHrsB}>SxHw8o~y}p>f9zyceF6$C)?_hW1sfv z)&1k(FJYa__HA~^wdU_x_wLtT8?Ak~#S0P|{WsP;ow)7%)WiG#x#Nsc|Gi^w`uHsS zTx9;w4{5u;zx_wngk4RRZ7;QH@cVwTP?ztLr(5Oo>V9llLjKNO8Rv5k4EecC$K%2X zqv;dE79NRceOZ(yT6Zk_MA?pev42f6{n}+(Q@iC>WyaxubiXs6H8m@_?c zLH&2pDcwfy%xmcNSm6Kb#1l8as$cNuUkguOSmC{7<$}uW+?Q96&E5LyW@y6n?0Mfg z8dcR#pEG*Sg!F-vmi?r^`{<>Vx3|-dE%Z6c*|vo<|*%M!5 zzhL{gm#>WLT)FNu(+@4n-M?hznKr|{?s?{HvElakZPDoEM@Q~?IX5KUQc!U#Fmrp_ zw7CWTui9qMAK)16U?1=3?zyzkq+9<5wHIe6ek`pEST}Fr6T5Za^*+7-V!x&_CEvbV z!J71w{lN^giPwnr;@IV)hR*>u71s@rKT-R~!$;Jm=R&0sloK4xc@5Fs5 z7+rK0+YNrWq|Q$TG`WkxYmFVCNI=O()aLpMSmR$IH(7uLG6!ID z{)R1j~$<);vzME2D4r*%dZD3F*(83Mof*kyl#?(<$sS>e~UZ2Pfh6EV!H8 zvm-ojj`_4c=F_jiPIAxDWEbe6AH4F(m-L3kOg?Ns^d>x5rbif$gu}i`5g9@HQwJUJ z$ORti;zLRiK=8$pc(FJ-dUwf9-LP$hjjwoIZs^0!gc6&=Yeuo;t}Ixt2fDb&_3ye^ zVnTRFUFyOE?hN*gOi*AG9w|t&BWbJyx*f>pHlg_A1+^DWXC!nH2@hVhTrC=C(ZGL? z2ISlSzbbVaASXm8_D4K363dzho4Mi8lk(vnLG^cTq!00jP4RHp^z;GfaM+o4gLo(` zL;6rKU#dq90Bm2t@`pS2uO&b+GJn*V;?UfD0LDioghxe@r2O1MVG%xs7YrXW5*Dch zNuyvxwSPfIEUZMt6lMwwNxX2Zu&_u-!i8gVhYO?9^Rvf58i@^y8ks=C3i1jHqYE;H zBql2hV|nSt@GKy)>7#^&3Ax`0NmN8)VnjTNDa-}>>BYGP`6M;k$eC`9AJG{{H+_eySw>U+J*9bX;{A=o22zR3~d-VbFji zK_88&Y#3<-zY=tfdk642m+-f@|ckO$Ub)Tn}S z%b;Z8z@;m7lHtP{6c{waD87VkLfz4O zz-3SfY%}q*73HynuuLf!mYPe};m}7UFpO|XqykKb0S~=mt0N?hLOO(RiUW*v@h1b?rXE2YBr=ftreiD; z5B5OBX>5q0#_2R2h@r0O7>5j^{0Tay3#U_1zZk>(!(qvrkVDXqpvRO6r&xp}3+!8$ z!a$l4P*xfPy{T+Ceu|%5F$VJK11*B42qz`T*HnoP!6_FG&>TU1^2FF!+kL6!TjY<& zCPq@0&tmIAj14gwt^y)V$F`N4S!k_!GF=nN?60fkhGf*xq2 zKZS)9@aT$+0+x3Glo!rDbq5r;(1@WH zQ;~*&91V=4Z4V%W;lrjlwgT)(cm*`djHz_Vkt4>@jH7_dFfq0vg>6M)!^Q_-=aT}^ zG~!}w=qpFrh{DB}C!scs#FS|}!MaMpw^c%#1=Ji1{;Gif3?%~i=mXpg>VrkaVo4l) zXfALNh=K`#I&#G}gE=H|Y%h}d4VWJ+1cOUt*@KB8i?-)l}F;2-0@i)NFkc{g}NH(_}1Zf!ohlO(#op5>%DNAU1`j64T7uXD>yJSU? zu;YJFzWV*gm>je3=fm*Xt>G3QU@swH`%<$sSF}Zn}17RCVUSwQZ_2T<_xp{iJ zd%E-8yL2qfa#wh;Qhbt ziid+&1@Pi19vryKhkGHsLQ0#<5`Kyx(HYtikBi^*Sr54Np(09OsAmai5O6Pq!+IH% z93v!Pjqk1DHy9HBc-J)JhzuGN4<_PkvPQzuM=X0JXd#P|2_eOB;IIH7>Muv&&w^xZ nKbrFQLUP!6;L?R7WCd^>5@irlHK3h5@RmQV%ijYTi~0W_h$gJ6 From 4143a67238fe8799811d7f46980234aa47c3f0f7 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 7 Aug 2020 17:35:43 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 4 ++-- Application/Admin/View/CompanyStatementPool/viewPuPool.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 5a5f262ec..4038d7417 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1902,7 +1902,7 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ //增加结算记录 foreach ($data['statement_info'] as $key => $value) { $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1)->mergeCells("J$line:K$line"); - $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']); + $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['statement_begin_time'].'-'.$value['statement_end_time']); if ($value['statement_type'] > 0) {//罚款 $product_name = $value['game_name']; $objPHPExcel->getActiveSheet()->setCellValue('F'.$line , '-'); @@ -2019,7 +2019,7 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1); $objPHPExcel->getActiveSheet()->removeConditionalStyles(); - $objPHPExcel->getActiveSheet()->setCellValue('A'.$line, $value['statement_begin_time'] . '-' . $value['statement_end_time']); + $objPHPExcel->getActiveSheet()->setCellValue('A'.$line, $value['statement_begin_time'].'-'.$value['statement_end_time']); if ($value['statement_type'] > 0) {//罚款 $product_name = $value['game_name']; $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, '-'); diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index ad3b017f0..da97641cc 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -143,7 +143,7 @@ {$com['statement_info'][0]['game_name']} {$com['statement_info'][0]['game_type_name']} - {$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']} + {$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']} {$com['statement_info'][0]['pay_amount']} From 5db1f7ce2489f8bb2fca650f0565b2daf5289901 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 7 Aug 2020 18:32:53 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 8 ++++---- .../Controller/CompanyStatementSetController.class.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 4038d7417..2035dca2b 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1925,12 +1925,12 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ if($value['first_ratio'] == 0){ $value['first_ratio'] = 0; }else{ - $value['first_ratio'] = number_format($value['first_ratio'], 2); + $value['first_ratio'] = number_format($value['first_ratio']); } if($value['second_ratio'] == 0) { $value['second_ratio'] = 0; }else{ - $value['second_ratio'] = number_format($value['second_ratio'], 2); + $value['second_ratio'] = number_format($value['second_ratio']); } if($value['promote_ratio'] == 0) $value['promote_ratio'] = 0; if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; @@ -2041,12 +2041,12 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al if($value['increment_ratio'] == 0){ $value['increment_ratio'] = 0; }else{ - $value['increment_ratio'] = number_format($value['first_ratio'], 2); + $value['increment_ratio'] = number_format($value['first_ratio']); } if($value['ratio'] == 0) { $value['ratio'] = 0; }else{ - $value['ratio'] = number_format($value['ratio'], 2); + $value['ratio'] = number_format($value['ratio']); } if($value['fax_ratio'] == 0) $value['fax_ratio'] = 0; diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 1bb986703..9eaafb685 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -327,11 +327,11 @@ class CompanyStatementSetController extends Controller { } } if($v['first_company_type'] == 1){ - $game['first_ratio']=$tratio; + $game['first_ratio']=$tratio-0; $game['second_ratio']=100-$tratio; }else{ $game['first_ratio']=100-$tratio; - $game['second_ratio']=$tratio; + $game['second_ratio']=$tratio-0; } $add_data['pay_amount'] += $va['pay_money']; @@ -634,7 +634,7 @@ class CompanyStatementSetController extends Controller { $tratio = $tratio1-$tratio2+$company_ratio; if($tratio <= 0){ continue;} } - + $tratio = $tratio-0; if($v['type'] == 2){ $game['increment_ratio']=$tratio; }else{ From 141951467cd7d2aafb370d02df36ddfcc1e0f5bd Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 11 Aug 2020 10:37:02 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E9=87=8D=E7=AE=97=E7=94=A8=E6=88=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 9eaafb685..3da5da42e 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1117,12 +1117,17 @@ class CompanyStatementSetController extends Controller { * 保存信息汇总信息 */ public function savePromotateUserPool($data){ + if(IS_CLI){ + $op_name ="system"; + }else{ + $op_name =$_SESSION['onethink_admin']['user_auth']["username"]; + } if(empty($data['create_lack_ids']) && empty($data['del_lack_ids']) && empty($data['info_ids'])){ //补点为空不重算 return ; } if($data['statement_money'] == 0){ $data['verify_status'] = 5; - $data['verify_log'] = json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + $data['verify_log'] = json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s"),"verify_user"=>$op_name,"verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); } $data['create_lack_ids'] = implode(",",$data['create_lack_ids']); $data['del_lack_ids'] = implode(",",$data['del_lack_ids']); From 9b78b8b4616f2f849eb067b5469a3fe98e45469e Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 11 Aug 2020 14:21:37 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementSetController.class.php | 41 ++++++++----------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 3da5da42e..b25c742d1 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -793,12 +793,12 @@ class CompanyStatementSetController extends Controller { } } - public function promoteUserPool($type,$stime,$recount = false,$is_payment=false){ + public function promoteUserPool($type,$stime,$recount = false){ $t = $this->setBeginAndEndTime($type,$stime); $begintime = $t[0]; $endtime = $t[1]; - $basedata = [ + $user = [ "pay_amount"=>0, "statement_money"=>0, "lack_statement_money"=>0, @@ -813,45 +813,40 @@ class CompanyStatementSetController extends Controller { "verify_status"=>0, "company_type"=>2, "verify_log"=>json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s")]), - "op_time"=>time() + "op_time"=>time(), + "statement_num"=>"PL_".date('Ymd').date('His').sp_random_num(3) ]; - $users = $user = $basedata; - $users['is_payment'] = 1; - $users['statement_num'] = "PL_".date('Ymd').date('His').sp_random_num(3); + // $users = $user = $basedata; + // $users['is_payment'] = 1; + // $users['statement_num'] = "PL_".date('Ymd').date('His').sp_random_num(3); - $user['is_payment'] = 2; - $user['statement_num'] = "PL_".date('Ymd').date('His').sp_random_num(3); + // $user['is_payment'] = 2; + // $user['statement_num'] = "PL_".date('Ymd').date('His').sp_random_num(3); if($type == 0){//周结 - $this->doPromoteUserPool($user,$users,$type,$stime,$recount); + $this->doPromoteUserPool($user,0,$stime,$recount); }else if($type == 1){ $users['withdraw_type'] = 1; $user['withdraw_type'] = 1; //月结&补点 - $this->doPromoteUserPool($user,$users,1,$stime,$recount); + $this->doPromoteUserPool($user,1,$stime,$recount); }else{ $users['withdraw_type'] = 2; $user['withdraw_type'] = 2; - $this->doPromoteUserPool($user,$users,2,$stime,$recount); - } - if($is_payment !== false && $is_payment==1){ - $this->savePromotateUserPool($users); - }else if($is_payment !== false && $is_payment==2){ - $this->savePromotateUserPool($user); - }else{ - $this->savePromotateUserPool($users); - $this->savePromotateUserPool($user); + $this->doPromoteUserPool($user,2,$stime,$recount); } + + $this->savePromotateUserPool($user); } /** * 下游个人汇总单 */ - public function doPromoteUserPool(&$user,&$users,$type,$stime,$recount = false) + public function doPromoteUserPool(&$user,$type,$stime,$recount = false) { $t = $this->setBeginAndEndTime($type,$stime); $begintime = $t[0]; @@ -932,11 +927,7 @@ class CompanyStatementSetController extends Controller { } //获取其他信息 $v = $this->getCompanyOtherInfo($v,$k); - if($v['is_payment'] == 1){ - $countdata = &$users; - }else{ - $countdata = &$user; - } + $countdata = &$user; $v['statement_money'] = 0; $v['pay_amount'] = 0; $v['fine'] = 0; From 95b464f636b74bbbbf1d30eca5ead60af78c9c8b Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 11 Aug 2020 14:22:53 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E4=BC=9A=E9=95=BF=E9=98=BF=E9=87=8C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index b25c742d1..6b6558659 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -895,11 +895,11 @@ class CompanyStatementSetController extends Controller { "company_id"=>$v['id'], "withdraw_done"=>1 ]; - $pres = $Promote->field("alipay_account,alipay_real_name")->where($p_map)->find(); - if(!empty($pres) && !empty($pres['alipay_account']) && !empty($pres['alipay_real_name'])){ - $v['ali_user'] = $pres['alipay_real_name']; - $v['ali_account'] = $pres['alipay_account']; - } + // $pres = $Promote->field("alipay_account,alipay_real_name")->where($p_map)->find(); + // if(!empty($pres) && !empty($pres['alipay_account']) && !empty($pres['alipay_real_name'])){ + // $v['ali_user'] = $pres['alipay_real_name']; + // $v['ali_account'] = $pres['alipay_account']; + // } if($v['has_ratio']){ $v['turnover_ratio'] = json_decode($v['turnover_ratio'],true); } From 7beaff18253c1f260b39d3ba22ebb1fcc3ae7901 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 11 Aug 2020 14:46:37 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=B1=87=E6=80=BB=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 8 +++- .../View/CompanyStatementPool/viewPuPool.html | 42 ++++++++----------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 3ab8f3d1b..06140f036 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -233,7 +233,6 @@ class CompanyStatementPoolController extends ThinkController } //个人汇总结算查看 public function viewPuPool(&$infolist,$is_export){ - // dd($infolist); $line = 1; $count = []; //获取对接人 @@ -242,6 +241,13 @@ class CompanyStatementPoolController extends ThinkController $v['company_info'] = json_decode($v['company_info'],true); $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); + if( isset($v['verify_status'])){ + if( $v['verify_status'] ==2 ){ + $v['is_payment'] = 2; //不打款 + }else{ + $v['is_payment'] = 1; + } + } $cline = $line+1; if($is_export){ $v['sum_money_exp'] = "="; diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index da97641cc..0b8eb029f 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -111,19 +111,14 @@ 奖励 罚款 结算金额 - - 开户名 - 银行卡号 - 开户支行 - 帐户类型 - - - 支付宝真实姓名 - 支付宝账号 - - 备注 + 户名 + 帐号 + 开户行 + 是否支付宝打款 是否结算 + 备注 + 操作 @@ -157,20 +152,23 @@ {$com['statement_info'][0]['fine']} {$com['statement_info'][0]['sum_money']} - + {$com.company_info.payee_name}  {$com.company_info.bank_account} {$com.company_info.opening_bank} - - + {$com.company_info.ali_user} {$com.company_info.ali_account} + - {$com.remark} + + + 是 否 否 是 + {$com.remark} @@ -215,16 +213,10 @@ {$count.sum_money|default=0} - - - - - - - - - - + + + + From ea7bafec91c8755bf04a86678d40a8c2617a121d Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 11 Aug 2020 15:39:34 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E9=87=8D=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementPoolController.class.php | 2 +- .../Admin/Controller/CompanyStatementSetController.class.php | 4 +++- Application/Admin/View/CompanyStatementPool/lists.html | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 06140f036..e554313b6 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -786,7 +786,7 @@ class CompanyStatementPoolController extends ThinkController //重新计算 $stime = $info['statement_end_time']-0+1; $type = $info['withdraw_type']; - A("CompanyStatementSet")->promoteUserPool($type,$stime,true,$info['is_payment']); + A("CompanyStatementSet")->promoteUserPool($type,$stime,true); M()->commit(); $this->ajaxReturn(array( diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 6b6558659..85c10b0fa 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1118,7 +1118,9 @@ class CompanyStatementSetController extends Controller { } if($data['statement_money'] == 0){ $data['verify_status'] = 5; - $data['verify_log'] = json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s"),"verify_user"=>$op_name,"verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + $data['verify_log'] = json_encode(["create_user"=>$op_name,"create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + }else{ + $data['verify_log'] = json_encode(["create_user"=>$op_name,"create_time"=>date("Y-m-d H:i:s")]); } $data['create_lack_ids'] = implode(",",$data['create_lack_ids']); $data['del_lack_ids'] = implode(",",$data['del_lack_ids']); diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index 1ccc25ea1..d275a57bb 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -155,7 +155,7 @@ 结算时间 结算类型 结算周期 - 是否打款 + 结算金额 不结算金额 @@ -182,7 +182,7 @@ {$data.valid} {$data.company_type_str} {$data.withdraw_type} - {$data.is_payment_str} + {$data.statement_money} {$data.lack_statement_money} From 027b1f2c08dfaf38c9e161f122f505582ec0f5c1 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 11 Aug 2020 15:41:13 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E5=90=88=E5=B9=B6ma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementPoolController.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index b3e48bd6f..0efd42f8d 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -783,12 +783,10 @@ class CompanyStatementPoolController extends ThinkController $this->ajaxReturn(array('status' => 0,"info"=>"重算失败")); } } - M()->commit(); - //重新计算 $stime = $info['statement_end_time']-0+1; $type = $info['withdraw_type']; - + A("CompanyStatementSet")->promoteUserPool($type,$stime,true); M()->commit(); $this->ajaxReturn(array( From 62f91bb0dfdb642a1d7a734f96220fb5dc407966 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 11 Aug 2020 17:36:14 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementPoolController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 0efd42f8d..fbcf15a55 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -498,7 +498,7 @@ class CompanyStatementPoolController extends ThinkController $id = $_REQUEST['id']; $CompanyInfo = M("company_statement_info","tab_") ->alias('i') - ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,p.statement_num,i.remark,i.pay_status,p.statement_money all_money") + ->field("i.id,i.pool_id,i.company_name,i.company_info,i.statement_money,p.statement_num,i.remark,i.pay_status,p.statement_money all_money,i.verify_status") ->join("tab_company_statement_pool p ON p.id = i.pool_id") ->where("pool_id='{$id}'") ->select(); @@ -538,7 +538,7 @@ class CompanyStatementPoolController extends ThinkController $CompanyInfo->save($savedata); } //修改状态 - $this->setOneVerifyStatus(2,"payment",$_REQUEST['pool_id'],$mgs = "打款信息提交"); + $this->setOneVerifyStatus(2,"payment",$_REQUEST['pool_id'],$mgs = "打款信息确认"); } //查看打款信息 public function viewPayment(){ @@ -907,7 +907,7 @@ class CompanyStatementPoolController extends ThinkController "setUlPayment"=>"线下打款", - "setPayment"=>"打款信息提交", + "setPayment"=>"打款信息确认", "editPayment"=>"打款信息编辑", "viewPayment"=>"打款详情", From ec7b333fa4a08267ceb8d07b1af0d4f250f9d0f8 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 12 Aug 2020 10:43:09 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=89=93=E6=AC=BE=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 30 +++++-- .../View/CompanyStatementPool/lists.html | 2 +- .../View/CompanyStatementPool/setPayment.html | 84 +++++++++---------- 3 files changed, 62 insertions(+), 54 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index fbcf15a55..2cf7746a9 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -502,12 +502,18 @@ class CompanyStatementPoolController extends ThinkController ->join("tab_company_statement_pool p ON p.id = i.pool_id") ->where("pool_id='{$id}'") ->select(); + foreach($CompanyInfo as $k=>&$v){ + if($v['verify_status'] == 2){ + $v['is_payment'] = 2; + }else{ + $v['is_payment'] = 1; + } + $v['company_info'] = json_decode($v['company_info'],true); $v['company_info']['ali_user'] ?? ''; $v['company_info']['ali_account'] ?? ''; } - $this->assign("CompanyInfo",$CompanyInfo); $this->assign("id",$id); $this->display(); @@ -520,20 +526,26 @@ class CompanyStatementPoolController extends ThinkController //循环保存 foreach($info as $k=>$v){ $ydata = $CompanyInfo->where("id= '{$k}'")->find(); - if($ydata['verify_status'] == 2){continue;} - $company_info = json_decode($ydata['company_info'],true); - $company_info['ali_user'] = $v['ali_user']; - $company_info['ali_account'] = $v['ali_account']; + if($ydata['verify_status'] == 2){ + $company_info['payee_name'] = $v['payee_name']; + $company_info['bank_account'] = $v['bank_account']; + $company_info['opening_bank'] = $v['opening_bank']; + }else{ + $company_info['ali_user'] = $v['ali_user']; + $company_info['ali_account'] = $v['ali_account']; + } $savedata = [ "company_info"=>json_encode($company_info,JSON_UNESCAPED_UNICODE), "remark"=>$v['remark'], "id"=>$k ]; - if(empty($v['ali_user']) || empty($v['ali_account'])){ - $savedata['verify_status'] = -1; - }else{ - $savedata['verify_status'] = 1; + if($ydata['verify_status'] != 2){ + if(empty($v['ali_user']) || empty($v['ali_account'])){ + $savedata['verify_status'] = -1; + }else{ + $savedata['verify_status'] = 1; + } } $CompanyInfo->save($savedata); } diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index d275a57bb..831d04102 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -430,7 +430,7 @@ title: "海南万盟天下科技有限公司", shadeClose: true, shade: 0.8, - area: ['70%', '80%'], + area: ['80%', '80%'], content: url }); }) diff --git a/Application/Admin/View/CompanyStatementPool/setPayment.html b/Application/Admin/View/CompanyStatementPool/setPayment.html index 9ace64b39..841a5dee4 100644 --- a/Application/Admin/View/CompanyStatementPool/setPayment.html +++ b/Application/Admin/View/CompanyStatementPool/setPayment.html @@ -105,10 +105,14 @@ 序号 合作公司 - 支付宝真实名称 - 支付宝账号 + 是否支付宝打款 + + 户名 + 帐号 + 开户行 + 关联结算汇总单订单号 - 金额(元) + 结算金额(元) 备注 @@ -118,8 +122,18 @@ {$key-0+1} {$vo.company_name} - - + + 是 + + + + + 否 + + + + + {$vo.statement_num} {$vo.statement_money} @@ -128,8 +142,18 @@ {$key-0+1} {$vo.company_name} - {$vo.company_info.ali_user} - {$vo.company_info.ali_account} + + + 是 + {$vo.company_info.ali_user} + {$vo.company_info.ali_account} + + + 否 + {$vo.company_info.payee_name} + {$vo.company_info.bank_account} + {$vo.company_info.opening_bank} + {$vo.statement_num} {$vo.statement_money} {$vo.remark} @@ -139,7 +163,7 @@ 合计: - 打款总金额:{$CompanyInfo[0]['all_money']} + 结算总金额:{$CompanyInfo[0]['all_money']} @@ -155,47 +179,20 @@ From c1b5b2f71688920a4e5ef3b471820392cb7a9f68 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 12 Aug 2020 19:35:39 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=85=AC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 1bc38bff5..3d6c712ab 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -398,9 +398,6 @@ class CompanyStatementPoolController extends ThinkController if($is_export){ $v['statement_money_exp'] .= "K{$line}+"; $va['d_statement_money'] = "=F{$line}*G{$line}"; - $count['platform_amount_exp'] .= "E{$line}+"; - $count['platform_amount_exp2'] .= "F{$line}+"; - $count['d_statement_money_exp'] .= "K{$line}+"; }else{ $va['d_statement_money'] = round($va['pay_amount']*$va['ratio']/100,2); $count['platform_amount'] += $va['pay_amount']; @@ -412,9 +409,6 @@ class CompanyStatementPoolController extends ThinkController if($is_export){ $v['statement_money_exp'] .= "M{$cline}-L{$cline}"; $v['statement_money'] = $v['statement_money_exp']; - $count['fine_exp'] .= "L{$cline}+"; - $count['reward_exp'] .= "M{$cline}+"; - $count['statement_money_exp'] .= "N{$cline}+"; }else{ $count['fine'] += $v['fine']; $count['reward'] += $v['reward']; @@ -424,12 +418,12 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - $count["d_statement_money"] = "=".trim($count["d_statement_money_exp"],"+"); - $count["platform_amount"] = "=".trim($count["platform_amount_exp"],"+"); - $count["platform_amount2"] = "=".trim($count["platform_amount_exp2"],"+"); - $count["fine"] = "=".trim($count["fine_exp"],"+"); - $count["reward"] = "=".trim($count["reward_exp"],"+"); - $count["statement_money"] = "=".trim($count["statement_money_exp"],"+"); + $count["d_statement_money"] = "=SUM(K3:K".$line.")"; + $count["platform_amount"] = "=SUM(E3:E".$line.")"; + $count["platform_amount2"] = "=SUM(F3:F".$line.")"; + $count["fine"] = "=SUM(L3:L".$line.")"; + $count["reward"] = "=SUM(M3:M".$line.")"; + $count["statement_money"] = "=SUM(N3:N".$line.")"; } // dd($infolist); $this->assign("data",$infolist); From 51778a2a738f9b66d9d4a116cf5a81f56ddf7216 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 12 Aug 2020 20:07:53 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=AF=BC=E5=87=BA=E5=8F=8A=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 10 ++- .../View/CompanyStatementPool/viewPcPool.html | 86 ++++++++++++++++--- 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 3d6c712ab..198518648 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -296,8 +296,16 @@ class CompanyStatementPoolController extends ThinkController unset($pl); foreach($infolist as $k=>&$v){ $v['statement_info'] = json_decode($v['statement_info'],true); + $v['company_info'] = json_decode($v['company_info'],true); $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); + if( isset($v['verify_status'])){ + if( $v['verify_status'] ==2 ){ + $v['is_payment'] = 2; //不打款 + }else{ + $v['is_payment'] = 1; + } + } $cline = $line+1; if($is_export){ $v['statement_money_exp'] = "="; @@ -351,7 +359,7 @@ class CompanyStatementPoolController extends ThinkController $count["reward"] = "=".trim($count["reward_exp"],"+"); $count["statement_money"] = "=".trim($count["statement_money_exp"],"+"); } - + // dd($infolist); $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html index 1821046e7..10e3aee4a 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html @@ -109,7 +109,18 @@ 合计/元 对账人 结算日期 + + + 户名 + 帐号 + 开户行 + 是否支付宝打款 + 是否结算 + 备注 + + 操作 + @@ -119,16 +130,40 @@ {$com.company_name} {$com['statement_info'][0]['game_name']} {$com['statement_info'][0]['pay_amount']} - {$com['statement_info'][0]['ratio']}% - {$com['statement_info'][0]['increment_ratio']}% - {$com['statement_info'][0]['fax_ratio']}% + {$com['statement_info'][0]['ratio']|showNumPercent} + {$com['statement_info'][0]['increment_ratio']|showNumPercent} + {$com['statement_info'][0]['fax_ratio']|showNumPercent} {$com['statement_info'][0]['d_statement_money']} - {$com.fine} - {$com.reward} - {$com.statement_money} + {$com['fine']-0} + {$com['reward']-0} + {$com['statement_money']-0} {$com.settlement_contact} - {$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']} + {$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']} + + + + {$com.company_info.payee_name} +  {$com.company_info.bank_account} + {$com.company_info.opening_bank} + + + + {$com.company_info.ali_user} + {$com.company_info.ali_account} + + + 是 否 + 否 是 + {$com.renark} + + + + + 不结算 + + + @@ -136,11 +171,11 @@ {$it['game_name']} {$it['pay_amount']} - {$it['ratio']}% - {$it['increment_ratio']}% - {$it['fax_ratio']}% + {$it['ratio']|showNumPercent} + {$it['increment_ratio']|showNumPercent} + {$it['fax_ratio']|showNumPercent} {$it['d_statement_money']} - {$it['statement_begin_time']} - {$it['statement_end_time']} + {$it['statement_begin_time']}-{$it['statement_end_time']} @@ -158,6 +193,14 @@ + + + + + + + + @@ -173,5 +216,26 @@ }); }); + $(".no_statement").on("click",function(){ + var id = $(this).data('id'); + $.ajax({ + type: "POST", + url: "{:U('cancelStatement')}", + dataType: 'json', + async: false, + data: {id:id}, + success:function(data){ + if(data.status==1){ + layer.msg("" + data.info + ""); + setTimeout(function(){ + window.location.reload(); + },1500); + }else{ + layer.msg("" + data.info + ""); + return false; + } + } + }); + }) From 0a049e0391422b244f718fa48dcea5732c35b832 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 12 Aug 2020 20:17:27 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 198518648..e78d86d9f 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -322,10 +322,6 @@ class CompanyStatementPoolController extends ThinkController $v['statement_money_exp'] .= "H{$line}+"; $va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})"; - - $count['platform_amount_exp'] .= "D{$line}+"; - $count['d_statement_money_exp'] .= "H{$line}+"; - }else{ $va['d_statement_money'] = round($va['pay_amount']*($va['ratio']+$va['increment_ratio'])*(100-$va['fax_ratio'])/100/100,2); @@ -339,11 +335,6 @@ class CompanyStatementPoolController extends ThinkController if($is_export){ $v['statement_money_exp'] .= "J{$cline}-I{$cline}"; $v['statement_money'] = $v['statement_money_exp']; - - $count['fine_exp'] .= "I{$cline}+"; - $count['reward_exp'] .= "J{$cline}+"; - - $count['statement_money_exp'] .= "K{$cline}+"; }else{ $count['fine'] += $v['fine']; $count['reward'] += $v['reward']; @@ -353,11 +344,11 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - $count["d_statement_money"] = "=".trim($count["d_statement_money_exp"],"+"); - $count["platform_amount"] = "=".trim($count["platform_amount_exp"],"+"); - $count["fine"] = "=".trim($count["fine_exp"],"+"); - $count["reward"] = "=".trim($count["reward_exp"],"+"); - $count["statement_money"] = "=".trim($count["statement_money_exp"],"+"); + $count["platform_amount"] = "=SUM(D2:D".$line.")"; + $count["d_statement_money"] = "=SUM(H2:H".$line.")"; + $count["fine"] = "=SUM(I2:I".$line.")"; + $count["reward"] = "=SUM(J2:J".$line.")"; + $count["statement_money"] = "=SUM(K2:K".$line.")"; } // dd($infolist); $this->assign("data",$infolist); From 0a136fbbde4df72574945b5ffe306b103ac4db91 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 13 Aug 2020 09:54:00 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementController.class.php | 20 +++++++++---------- .../CompanyStatementLackController.class.php | 8 ++++---- .../CompanyStatementPoolController.class.php | 14 ++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 0239a76e0..98f1e5cf5 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -132,12 +132,12 @@ class CompanyStatementController extends ThinkController ->order("FIELD(verify_status,0,1,-1,2,3,-2,-3),id desc")->page($page,$row)->select(); foreach($data as $k => &$v) { - $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); - $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); + $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); + $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); $v['company_belong'] = $this->CompanyBelong[$v['company_belong']]; - $v['op_time'] = date('Y-m-d H:i:s',$v['op_time']); - $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; + $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']); + $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}"; $v['withdraw_type_1'] = ($v['withdraw_type'] == 1 ? "月结" :"周结"); @@ -282,7 +282,7 @@ class CompanyStatementController extends ThinkController $y = M("CompanyStatement", "tab_")->where("id='{$params['id']}'")->find(); if($y['first_party_info'] != $params['first_party_info'] || $y['second_party_info'] != $params['second_party_info'] || $y['statement_info'] != $params['statement_info']){ $params['verify_status'] = 0; - $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]); $params['op_time'] = time(); M("CompanyStatement","tab_")->save($params); } @@ -342,7 +342,7 @@ class CompanyStatementController extends ThinkController if($v['confirm_status'] != 0) continue; $v['confirm_log'] = json_decode($v['confirm_log'],true); $v['confirm_log']['launch_user']=$this->admininfo["username"]; - $v['confirm_log']['launch_time']=date("Y-m-d H:i:s"); + $v['confirm_log']['launch_time']=date("Y.m.d H:i:s"); $v['confirm_log'] = json_encode($v['confirm_log']); $v['confirm_status']=1; // $v['op_time'] = time(); @@ -364,7 +364,7 @@ class CompanyStatementController extends ThinkController if($v['verify_status'] != $old_status) continue; $v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; - $v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); + $v['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s"); $v['verify_log'] = json_encode($v['verify_log']); $v['verify_status']=$change_status; $v['op_time'] = time(); @@ -484,7 +484,7 @@ class CompanyStatementController extends ThinkController "fine"=>0, "reward"=>0, "verify_status"=>0, - "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]), + "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]), "op_time"=>time(), "company_list"=>[] ]; @@ -534,7 +534,7 @@ class CompanyStatementController extends ThinkController if($v['statement_money'] == 0){ $v['verify_status'] = 5; - $v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]); + $v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y.m.d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y.m.d H:i:s")]); } //判断周月结 if(($v["statement_end_time"]-$v['statement_begin_time']) > 7*24*3600){ @@ -568,7 +568,7 @@ class CompanyStatementController extends ThinkController if($v['verify_status'] != $old_status) continue; $v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; - $v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); + $v['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s"); $v['verify_log'][$op_pre.'_num']=$num; $v['verify_log'] = json_encode($v['verify_log']); $v['verify_status']=$change_status; diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index 2403610c6..46ada8f23 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -75,11 +75,11 @@ class CompanyStatementLackController extends ThinkController foreach($data as $k => &$v) { - $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); - $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); + $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); + $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); $v['is_payment_str'] = $this->IsPayment[$v['is_payment']]; $v['company_type_str'] = $this->CompanyType[$v['company_type']]; - $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; + $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}"; $v['oplist'] = $this->OpAuth($v); } @@ -146,7 +146,7 @@ class CompanyStatementLackController extends ThinkController "fine"=>0, "reward"=>0, "verify_status"=>0, - "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]), + "verify_log"=>json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y.m.d H:i:s")]), "op_time"=>time(), "company_list"=>[] ]; diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index e78d86d9f..b4d3a5fe9 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -113,8 +113,8 @@ class CompanyStatementPoolController extends ThinkController ->page($page,$row)->select(); foreach($data as $k => &$v) { - $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']); - $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']); + $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); + $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); $v['company_type_str'] = $this->CompanyType[$v['company_type']]; $v['is_payment_str'] = $this->IsPayment[$v['is_payment']]; @@ -123,8 +123,8 @@ class CompanyStatementPoolController extends ThinkController $v['can_export'] = 1; } - $v['op_time'] = date('Y-m-d H:i:s',$v['op_time']); - $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}"; + $v['op_time'] = date('Y.m.d H:i:s',$v['op_time']); + $v["valid"] = "{$v['statement_begin_time']}-{$v['statement_end_time']}"; $v['ext_file_type'] = empty($v['ext_file']) ? "无" : "有"; $v['withdraw_type'] = $this->WithdrawType[$v['withdraw_type']];; @@ -465,7 +465,7 @@ class CompanyStatementPoolController extends ThinkController if($v['verify_status'] != $old_status) continue; $v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; - $v['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); + $v['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s"); $v['verify_log'] = json_encode($v['verify_log']); $v['verify_status']=$change_status; $this->DBModel->save($v); @@ -483,7 +483,7 @@ class CompanyStatementPoolController extends ThinkController $dbres = $this->DBModel->field("id,verify_status,verify_log")->where("id = {$id}")->find(); $dbres['verify_log'] = json_decode($dbres['verify_log'],true); $dbres['verify_log'][$op_pre.'_user']=$this->admininfo["username"]; - $dbres['verify_log'][$op_pre.'_time']=date("Y-m-d H:i:s"); + $dbres['verify_log'][$op_pre.'_time']=date("Y.m.d H:i:s"); $dbres['verify_log'] = json_encode($dbres['verify_log']); $dbres['verify_status']=$change_status; $this->DBModel->save($dbres); @@ -854,7 +854,7 @@ class CompanyStatementPoolController extends ThinkController foreach($st_res as $k=>&$v){ $v['verify_log'] = json_decode($v['verify_log'],true); $v['verify_log']['pool_user']=$this->admininfo["username"]; - $v['verify_log']['pool_time']=date("Y-m-d H:i:s"); + $v['verify_log']['pool_time']=date("Y.m.d H:i:s"); $v['verify_log'] = json_encode($v['verify_log']); $v['verify_status']=-3; $stres = M("company_statement","tab_")->save($v); From d63edee6b36558471d5640a960b81d539ae6b3dc Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 13 Aug 2020 10:17:49 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 8 ++++---- .../View/CompanyStatement/viewCpStatement.html | 14 +++++++------- .../View/CompanyStatement/viewPcStatement.html | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 2035dca2b..6cda8d817 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1918,10 +1918,10 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ } } else {//游戏 $product_name = $value['game_name']; - $objPHPExcel->getActiveSheet()->getStyle('F'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); - $objPHPExcel->getActiveSheet()->getStyle('G'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); - $objPHPExcel->getActiveSheet()->getStyle('H'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00); - $objPHPExcel->getActiveSheet()->getStyle('I'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_000); + $objPHPExcel->getActiveSheet()->getStyle('F'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE); + $objPHPExcel->getActiveSheet()->getStyle('G'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE); + $objPHPExcel->getActiveSheet()->getStyle('H'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE); + $objPHPExcel->getActiveSheet()->getStyle('I'.$line)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE); if($value['first_ratio'] == 0){ $value['first_ratio'] = 0; }else{ diff --git a/Application/Admin/View/CompanyStatement/viewCpStatement.html b/Application/Admin/View/CompanyStatement/viewCpStatement.html index eadbad10d..353bcdf78 100644 --- a/Application/Admin/View/CompanyStatement/viewCpStatement.html +++ b/Application/Admin/View/CompanyStatement/viewCpStatement.html @@ -210,7 +210,7 @@ - {$it.statement_begin_time}~{$it.statement_end_time} + {$it.statement_begin_time}-{$it.statement_end_time} {$it.game_name} -{$it.pay_amount} @@ -218,10 +218,10 @@ {$it.pay_amount} - {$it.first_ratio}% - {$it.second_ratio}% - {$it.promote_ratio}% - {$it.fax_ratio}% + {$it.first_ratio|showNumPercent} + {$it.second_ratio|showNumPercent} + {$it.promote_ratio|showNumPercent} + {$it.fax_ratio|showNumPercent} @@ -240,12 +240,12 @@ 合计 - {$data.statement_count.pay_amount} + {$data['statement_count']['pay_amount']-0} - {$data.statement_count.statement_money} + {$data['statement_count']['statement_money']-0} 本月分成总金额(人民币大写): diff --git a/Application/Admin/View/CompanyStatement/viewPcStatement.html b/Application/Admin/View/CompanyStatement/viewPcStatement.html index 9765e8d35..cbc05dfc5 100644 --- a/Application/Admin/View/CompanyStatement/viewPcStatement.html +++ b/Application/Admin/View/CompanyStatement/viewPcStatement.html @@ -206,7 +206,7 @@ - {$it.statement_begin_time}~{$it.statement_end_time} + {$it.statement_begin_time}-{$it.statement_end_time} {$it.game_name} -{$it.pay_amount} @@ -215,11 +215,11 @@ - {$it.increment_ratio}% + {$it.increment_ratio|showNumPercent} - {$it.ratio}% + {$it.ratio|showNumPercent} - {$it.fax_ratio}% + {$it.fax_ratio|showNumPercent} @@ -236,10 +236,10 @@ 合计 - {$data.statement_count.pay_amount} + {$data['statement_count']['pay_amount']-0} - {$data.statement_count.statement_money} + {$data['statement_count']['statement_money']-0} 本月分成总金额(人民币大写): From 7eee79a86738a4fe520fc7eaeceb23a552b22649 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 14 Aug 2020 10:49:41 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatementPool/viewPuPool.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index 0b8eb029f..80e02d5d5 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -186,7 +186,7 @@ {$it['game_name']} {$it['game_type_name']} - {$it['statement_begin_time']} - {$it['statement_end_time']} + {$it['statement_begin_time']}-{$it['statement_end_time']} {$it['pay_amount']}