From: Aleksey Filippov Date: Fri, 3 May 2024 21:00:45 +0000 (+0300) Subject: правки по загрузке данных из АМО X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=2387d8e611f16b25b1f843f01f56a09766f9fd56;p=yii-erp24%2F.git правки по загрузке данных из АМО --- diff --git a/erp24/api1/views/cron/amo142.php b/erp24/api1/views/cron/amo142.php index e513c43..71becc5 100644 --- a/erp24/api1/views/cron/amo142.php +++ b/erp24/api1/views/cron/amo142.php @@ -279,15 +279,15 @@ if(!empty($_REQUEST["date1"])) { $sql_fields = []; $data = $db::getRows("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='erp24' AND TABLE_NAME='orders_amo';"); - echo '
';
-    var_dump($data);
-    echo '
'; +// echo '
';
+//    var_dump($data);
+//    echo '
'; // $data = $db::getRows("SHOW COLUMNS FROM orders_amo"); - echo (" __ " . __LINE__); +// echo (" __ " . __LINE__); try { foreach ($data as $col) { - print "
\n"; - print "
\n"; +// print "
\n"; +// print "
\n"; $sql_fields[] = $col["column_name"]; @@ -362,6 +362,14 @@ $delivery__date .='&filter[custom_fields_values][647935][from]='.$unix_delivery_ //print_r($_SESSION["uping"]); + echo '
';
+    if (!empty($deal0["_embedded"]["leads"])) {
+        var_dump(count($deal0["_embedded"]["leads"]));
+    } else {
+        echo 'нет записей';
+    }
+    echo '
'; + foreach($deal0["_embedded"]["leads"] ?? [] as $lid_id => $fieldarr) { $amo_id=$fieldarr["id"]; @@ -486,7 +494,7 @@ $delivery__date .='&filter[custom_fields_values][647935][from]='.$unix_delivery_ $param_insert=array(); $i=0; $upper=""; foreach($result as $row =>$value) { - if(!empty($sql_fields[$row]) and in_array($row,$update_fields) and !in_array($row,$unset_valiues) ) { // удаляем поля которых нет в таблице + if(in_array($row,$sql_fields) and in_array($row,$update_fields) and !in_array($row,$unset_valiues) ) { // удаляем поля которых нет в таблице if($i!=0) { $sql_query.=","; $upper.=","; } $sql_query.=" $row=:$row"; $upper .=" $row='$value' "; @@ -517,15 +525,15 @@ $delivery__date .='&filter[custom_fields_values][647935][from]='.$unix_delivery_ if(!empty($result["nomer"])) { try{ - echo" nomer=".$result["nomer"]." "; + echo" nomer=".$result["amo_id"]." "; - $yes_in_table_sql=$db::getValue("SELECT id FROM orders_amo WHERE id=?",[(int)$result["nomer"]]); + $yes_in_table_sql=$db::getValue("SELECT id FROM orders_amo WHERE id=?",[(int)$result["amo_id"]]); if(empty($yes_in_table_sql) ) { // insert - $z="INSERT INTO orders_amo (" . implode(", ", $insert_fields) . ", id, update_at) VALUES ('".implode("', '", $insert_values) ."' , '".$result["nomer"]."', NOW())"; + $z="INSERT INTO orders_amo (" . implode(", ", $insert_fields) . ", id, update_at) VALUES ('".implode("', '", $insert_values) ."' , '".$result["amo_id"]."', NOW())"; $db::sql($z); //$db::sql($z,$param_insert); @@ -538,7 +546,7 @@ $delivery__date .='&filter[custom_fields_values][647935][from]='.$unix_delivery_ } else { // update if(!empty($sql_query)) { - $z="UPDATE orders_amo SET $sql_query WHERE id='".$result["nomer"]."'"; + $z="UPDATE orders_amo SET $sql_query WHERE id='".$result["amo_id"]."'"; $db::sql($z,$param); //$db::sql($z,$param); @@ -606,7 +614,7 @@ $delivery__date .='&filter[custom_fields_values][647935][from]='.$unix_delivery_ } // end else { - mess("Заказ $ami_id уже внесен в базу"); + mess("Заказ $amo_id уже внесен в базу"); } diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index ef70f41..eb58ba9 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -78,7 +78,9 @@ class DataController extends BaseController { $mess["checks"] = ["start_time" => date("Y-m-d H:i:s", time() - 2 * 3600), "end_time" => date("Y-m-d H:i:s")]; // $mess["payment_types"] = false; - $createChecks = CreateChecks::find()->where(['status' => '0'])->andWhere(['>', 'date', date('Y-m-d H:i:s', time() - 3 * 86400)]) + //TODO ПОПРАВИТЬ ДАТУ ОТБОРА + $createChecks = CreateChecks::find()->where(['status' => '0'])->andWhere(['>', 'date', '2024-04-26']) +// $createChecks = CreateChecks::find()->where(['status' => '0'])->andWhere(['>', 'date', date('Y-m-d H:i:s', time() - 3 * 86400)]) ->orderBy(['date' => SORT_DESC])->limit(10)->all(); foreach ($createChecks as $createCheck) { if (!empty($createCheck->kkm_id)) { diff --git a/erp24/modul/orders/delivery.php b/erp24/modul/orders/delivery.php index 489d836..fa4e2cb 100644 --- a/erp24/modul/orders/delivery.php +++ b/erp24/modul/orders/delivery.php @@ -4,7 +4,7 @@ include_once(dirname(__DIR__, 2) . "/inc/db.php"); include_once(dirname(__DIR__, 2) . "/inc/base_new.php"); include_once(dirname(__DIR__, 2) . "/inc/design_new.php"); error_reporting(E_ALL); -global $ACCESS_TOKEN; + try { //include"templates/top.php"; @@ -14,7 +14,8 @@ if(!empty($_REQUEST["umoup"])) { $date1=mktime(0,0,0,date("n"),date("d",time()-86400),date("Y")); $date2=mktime(0,0,0,date("n"),date("d"),date("Y")); -include_once(dirname(__DIR__, 2) . "/inc/amo/amo_inc.php"); +global $ACCESS_TOKEN; +include_once(dirname(__DIR__, 1) . "/../inc/amo/amo_inc.php"); $dt="updated_at"; $statuses=[38932165,142]; @@ -22,7 +23,7 @@ $statuses=[38932165,142]; //$delivery__date='&filter['.$dt.'][from]='.$unix0.'&filter['.$dt.'][to]='.$date1.''; $delivery__date='&filter[custom_fields_values][647935][from]='.$date1.'&filter[custom_fields_values][647935][to]='.$date2.''; //&filter['.$dt.'][from]='.$date1.'&filter['.$dt.'][to]='.$date2.' - +$k=0; foreach($statuses as $status) { $deal0 = amo_rest($ACCESS_TOKEN, '/api/v4/leads?order[updated_at]=desc&limit=250&filter[statuses][0][pipeline_id]=4021495&filter[statuses][0][status_id]='.$status.''.$delivery__date.'', 'GET', []);