From e7e26610b60497c7f88a9758f6b23b0f7e9d8042 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 3 Nov 2020 17:03:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/Admin/excel/up_stream.xls | Bin 21504 -> 20992 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 8f56a516d3999e3167ddbc51da49dddefc10b6ca..8280dd9be0702a8f51a932a17561516eff7fd17f 100644
GIT binary patch
delta 826
zcma))-D}fe6voe+r5{OUYnssSugz{sC&tdntaQU+>_lce=Y<y&nJ6eIUPx8gperce
zD0J&74!l!DMEsy;x3b~2H$okvH~k-UUhKknk~Re?f(ZxC`JLy<^CqP7l2x9w)f^ja
zOrGFkzYW7MYcBw#sD`QbQCYlk_A;ySH-yD+#|~^Yw%HKg=I?PoCUKW9xcf*&Mg!OQ
z{q9>lO?1@?+8z^{V`rIi`e^vXaM$s@@3E4{ug=*VZC6&A>3G0#?BT+>Vg?j*{12`#
zx?V7r!=j*~Q&8}<5XGBf5X;nussAMeaYXcEUGU=*QNgkp#W7;9gmLUAo)gphTk(y9
zMe%~SDhDWZ$M6DdSor|F2M<aKj7ferg5#2!=~cv%EjsR??flts!j{F8_*zmCrQk}$
zRy1Lb+5~hI)U-3(++*|Jr1;-SO-Pb;;NSX`rH{9tp9ZK)(q>{a0leQ@#Oz?=>z;Lw
z%~N>ar?LQU_|(ymt!cs~fT`}G{WkA@s5D-b0yr$k$*IYAaaj_)-DTDa3}929p><SI
zL%na8>1eJf6t35mfQ!$6*h%W|BG)4fFfwt{^@t5oZdkuMvBZ21VCCiW3)^>EOJTzR
z5yI%s9${I1D%*0g5GJNe{W1t-U?9^i2>R3M68AnI<oN36wX_~R^~Etz{5Wd<&BsXw
o*Gfm9&2f6AP+^$VG}MZ@+Wai@;hFh}kby&xfx|GSOInrv0d)k?TmS$7

delta 817
zcma))QE1a(5XbLJlcq_fZJMmxn%Q=<uG>ULhpwy4;jmNCwFZWWOvE8mVd7-AA`@z4
z!xsl`y}_Op6<?fawg;akGT#JWbcnuG(05UM8ECv@tIjvSaNphi?(WY)KJz{^AF<h9
z*79`!K@QEFukM#^+erY}NtPmW@;2*c?kubD7p1QgFS`Qf8ry*-ev0$;;W}UN@zh3L
zHqP;F@d+oRlZPuX4mlWsBH0k#<1hiE)YBe{0&@qPA?IK-uSIIoHNPQ)>%vFR(eePk
z_YU@kz`ildoWiX!j@=#}I+g~Fvj5@M8Sx>*Zb`$6)P$|FhDXT9qy{V#`#^r5ya&DH
z7s)Qk5nLrdEqCB)DS-j%|0ZeHqWoB3aXb~egQ^-9{fR0qupN1&6Fo{4^Gd|wxU2?o
zNlCFLoL4$`MQFtzb_n1t7!<|<Ubu6u|8hTZ45;;uF}GU(x0;|ZxLM64-Kt)z&MV4F
zd?gNi#O2Lf_=11IU*id!4tKh{y$Z+D&JW()Xau0|&qj?kzC?j@_zqV!hMKxDeOx`~
zsIaWFDSlDAUCrHE%%y3UmNqi$f#wx?_04L<dZLf%tPb_efOwa+kgjf>&rGtE2&}90
ze6)Q1#PHhH>SWX=aI&x!*dT+B-+T75g4Ld_iY$t9e=(qdKq?Fr`UJt6=`V7YX_yR6
zW9(V3f#VNf`*hiAI`mEmex7k(>;dYB3&kEZh1@m|#g2gc_~!Ve6sF|0^Rld;`6+g9
XkgFJjOu@XN3t7lQ+8Q_J7zgkh^hn~i


From 6c005f01f65c4ec8444e1f37264dbfd89ea14266 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 4 Nov 2020 14:45:25 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=AF=94=E4=BE=8B=E6=B0=B8=E4=B9=85=E5=88=A4=E6=96=ADbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/TimingController.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index e34aee1b6..15fa2a2cf 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -872,7 +872,7 @@ class TimingController extends AdminController {
 //
         $company_data = M('promote_company','tab_')
             ->field("company_belong")
-            ->where("id=$company_id")
+            ->where("id={$company_id}")
             ->find();
 //
 //        $game_ratio_mould = M("game_ratio_mould","tab_")
@@ -1211,6 +1211,10 @@ class TimingController extends AdminController {
 
                 $ungame_ids = explode(',',$cv['game_ids']);
 
+                if ($cv['end_time'] == 0 || !$cv['end_time']) {
+                    $cv['end_time'] = 99999999999;
+                }
+
                 $use_begin = 0;
                 $use_end = 0;
                 if ($value['is_settlement'] == '0') {

From d85ac9066d1193b1848836f2e063021046c33505 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 4 Nov 2020 16:06:14 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/TimingController.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index 15fa2a2cf..0d051d020 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -1351,12 +1351,12 @@ class TimingController extends AdminController {
 //            }
             $promote_data[$key]['is_settlement'] = $value['is_settlement'];
 
-            $promote_data[$key]['company_tax'] = ($value['pay_amount']-$promote_data[$key]['cp_amount']- $promote_data[$key]['promote_amount'])*($tax/100);
-
             //毛利
             $promote_data[$key]['company_profit'] = $value['pay_amount']-$promote_data[$key]['cp_amount']-$promote_data[$key]['promote_amount']-$promote_data[$key]['channel_amount']-$promote_data[$key]['company_tax']-$specialAmount;
 
             $promote_data[$key]['promote_amount'] += $specialAmount;
+
+            $promote_data[$key]['company_tax'] = ($value['pay_amount']-$promote_data[$key]['cp_amount']- $promote_data[$key]['promote_amount'])*($tax/100);
 //            dump($promote_data[$key]['promote_amount']);
             if ($value['promote_id'] == 0) {
 //                $promote_data[$key]['promote_account']='官方渠道';

From a3b86e933982291a70954fdf521bb37f184c9b8e Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 4 Nov 2020 16:50:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/TimingController.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index 0d051d020..3c7825d35 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -1351,12 +1351,12 @@ class TimingController extends AdminController {
 //            }
             $promote_data[$key]['is_settlement'] = $value['is_settlement'];
 
-            //毛利
-            $promote_data[$key]['company_profit'] = $value['pay_amount']-$promote_data[$key]['cp_amount']-$promote_data[$key]['promote_amount']-$promote_data[$key]['channel_amount']-$promote_data[$key]['company_tax']-$specialAmount;
-
             $promote_data[$key]['promote_amount'] += $specialAmount;
 
             $promote_data[$key]['company_tax'] = ($value['pay_amount']-$promote_data[$key]['cp_amount']- $promote_data[$key]['promote_amount'])*($tax/100);
+
+            //毛利
+            $promote_data[$key]['company_profit'] = $value['pay_amount']-$promote_data[$key]['cp_amount']-$promote_data[$key]['promote_amount']-$promote_data[$key]['channel_amount']-$promote_data[$key]['company_tax'];
 //            dump($promote_data[$key]['promote_amount']);
             if ($value['promote_id'] == 0) {
 //                $promote_data[$key]['promote_account']='官方渠道';