From 805380680103e526fbc9fd93fb4bfcc589c776d9 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 2 Jul 2020 18:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=93=E5=91=98=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=A9bug=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, 4 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index 207901755..88daeabf1 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -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'] = "月初自动发放";