elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/market_percentage' of wmtx/platform into release

Browse Source 
市场专员业绩bug修改
master
廖金灵 4 years ago committed by Gogs
parent e6d791ae3c 8053806801
commit 02e3356694
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

6
Application/Admin/Controller/TimingController.class.php
Unescape Escape View File

@ -1023,15 +1023,17 @@ class TimingController extends AdminController {
$check_yes = date("Y",strtotime($value['pay_time']));
if ($market_percentage['time'] == 1) {
if ($month == '07'&&($check_month=='01'||$check_month=='02'||$check_month=='03')) {
$where['season'][] = $value['pay_time'];
} elseif($month == '10'&&($check_month=='04'||$check_month=='05'||$check_month=='06')) {
$where['season'][] = $value['pay_time'];
} elseif($month == '04'&&($check_month=='01'||$check_month=='02'||$check_month=='03')) {
} elseif($month == '04'&&($check_month=='10'||$check_month=='11'||$check_month=='12')&&$check_yes==($yes-1)) {
$where['season'][] = $value['pay_time'];
} elseif($month == '01'&&($check_month=='07'||$check_month=='08'||$check_month=='09')&&$check_yes==($yes-1)) {
$where['season'][] = $value['pay_time'];
}
// var_dump($check_month);die();
} elseif($market_percentage['time'] == 2) {
if ($month == '07'&&($check_month=='01'||$check_month=='02'||$check_month=='03'||$check_month=='04'||$check_month=='05'||$check_month=='06')) {
@ -1107,7 +1109,7 @@ class TimingController extends AdminController {
$insert['pay_amount'] = $data[$key]['pay_amount'];
$insert['extend_commission'] = $data[$key]['extend_commission'];
if ($month != $check_month) {
$insert['pay_amount'] = 2;
$insert['type'] = 2;
}
$insert['wait_commission'] = $data[$key]['wait_commission'];
$insert['remark'] = "月初自动发放";

Write Preview
Loading…
Cancel
Save