From ee6be3b45b42a2ed1883a8ebf0a0b10b1bd0a7c5 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 17 Jul 2020 14:42:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9?= =?UTF-8?q?=E6=8F=90=E6=88=90=E5=BD=93=E6=B5=81=E6=B0=B4=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E8=B5=B7=E6=8F=90=E6=B5=81=E6=B0=B4=E6=97=B6=EF=BC=8C=E7=A8=8E?= =?UTF-8?q?=E5=90=8E=E6=AF=9B=E5=88=A9=E4=B8=8D=E4=BA=88=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/MarketPercentageController.class.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 0c01e5d05..63a95465f 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -591,6 +591,9 @@ class MarketPercentageController extends ThinkController } $data = M("market_altogether","tab_") + ->field("tab_market_altogether.*,market_percentage") + ->join("left join sys_auth_group_access access on tab_market_altogether.admin_id = access.uid") + ->join("left join sys_auth_group auth on access.group_id=auth.id") ->where($map); if ($_REQUEST['export']) { @@ -628,6 +631,8 @@ class MarketPercentageController extends ThinkController $data[$key]['start_time'] = date("Y-m-1",strtotime($value['pay_time'])); $data[$key]['end_time'] = date("Y-m-t",strtotime($value['pay_time'])); + $market_percentage = json_decode($value['market_percentage'],true); + if ($value['level'] == 21) { $data[$key]['level'] = '初级'; } else if ($value['level'] == 11) { @@ -642,6 +647,13 @@ class MarketPercentageController extends ThinkController $data[$key]['is_send'] = '未发放'; } + //两个起提流水都没达到时，不展示税后毛利 + $sum_amount = $value['performance_revenue'] + $value['appraisal_bonuses']; + if ($sum_amount<$market_percentage['performance_revenue']&&$sum_amount<$market_percentage['appraisal_bonuses']) { + $data[$key]['company_profit'] = "0.00"; + $value['company_profit'] = "0.00"; + } + $data[$key]['wait_commission'] = number_format($value['wait_performance_commission'] + $value['wait_achievement_commission'], 2, '.', ''); From 22a65f840494e92432629af5f88cc56e827542b8 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 20 Jul 2020 16:54:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/PromoteCompany/export.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html index 7232a461c..66785a993 100644 --- a/Application/Admin/View/PromoteCompany/export.html +++ b/Application/Admin/View/PromoteCompany/export.html @@ -35,10 +35,16 @@ 公司性质 内外团归属 合同期限 + 开票税点 + 账户名 开户行 银行账号 是否签署合同 + + 支付宝真实姓名 + 支付宝账号 + 备注 会长账号 @@ -61,11 +67,18 @@ {$data.company_type} {$data.company_belong} {$data.contact_begin} - {$data.contact_end} + {$data.fax_ratio}% + {$data.bank_address} {$data.bank_name}  {$data.bank_card} {$data.is_sign_contact} + + {$data.ali_user} + {$data.ali_account} + {$data.content} + From 1bec15c1868f00368d8910223974a70f090d88d5 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 21 Jul 2020 16:58:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=81=E7=A7=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinancePromoteController.class.php | 3 +++ Application/Base/Service/PromoteService.class.php | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 2192aa350..7a616f3aa 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -275,6 +275,9 @@ class FinancePromoteController extends AdminController if($istimeselect){ $map['s.payed_time']=$istimeselect; } + if ($isMarketLeader) { + $map['s.market_admin_id'] = ['gt', 0]; + } if ($adminId > 0) { $map['s.market_admin_id'] = $adminId; } diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 7da8cc031..3a81709b5 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -379,6 +379,9 @@ class PromoteService { 'promote_id' => $toPromote['id'], 'promote_account' => $toPromote['account'] ]; + $updateMarket = [ + 'market_admin_id' => $toPromote['admin_id'], + ]; $map = $otherMap = ['promote_id' => $fromPromote['id']]; if (count($shiftIds) > 0) { @@ -397,12 +400,12 @@ class PromoteService { $orderMap1 = $otherMap; $orderMap1['pay_time'] = ['egt', $orderTime]; - M('spend', 'tab_')->where($orderMap1)->where(['is_check' => ['in','1,2'], 'settle_check' => 0, 'selle_status' => 0])->save($updateData); // 只改未对账的数据 + M('spend', 'tab_')->where($orderMap1)->where(['is_check' => ['in','1,2'], 'settle_check' => 0, 'selle_status' => 0])->save(array_merge($updateData, $updateMarket)); // 只改未对账的数据 M('bind_spend', 'tab_')->where($orderMap1)->save($updateData); $orderMap2 = $otherMap; $orderMap2['create_time'] = ['egt', $orderTime]; - M('deposit', 'tab_')->where($orderMap2)->save($updateData); + M('deposit', 'tab_')->where($orderMap2)->save(array_merge($updateData, $updateMarket)); M('user_play_data_count', 'tab_')->where($orderMap2)->save(['promote_id' => $toPromote['id']]); $status = M('shift_task', 'sys_')->where('id=' . $task['id'])->save(['status' => 1, 'handle_time' => time()]);