theojeng 3 лет назад
Родитель
Сommit
e9ba8fec51
1 измененных файлов с 25 добавлено и 24 удалено
  1. 25 24
      common/helpers/bonus/Calc/GeneratePerfOrder.php

+ 25 - 24
common/helpers/bonus/Calc/GeneratePerfOrder.php

@@ -140,17 +140,17 @@ class GeneratePerfOrder extends BasePerfBusiness
                     'LAST_REC_REAL_NAME' => $data['recName']['recRealName']['REAL_NAME'] ?? '',
                     'LAST_DEC_LV'        => $data['userByToUserId']['LAST_DEC_LV'] ?? '', //CalcCache 810
                     'LAST_EMP_LV'        => $data['userByToUserId']['EMP_LV'] ?? '',
-                    'LAST_STATUS'        => $data['userByToUserId']['STATUS'] ?? '',
+                    'LAST_STATUS'        => $data['userByToUserId']['STATUS'] ?? 0,
                     'LAST_SUB_COM_ID'    => $data['userByToUserId']['SUB_COM_ID'] ?? '',
-                    'LAST_PROVINCE'      => $data['userByToUserId']['PROVINCE'] ?? '',
-                    'LAST_CITY'          => $data['userByToUserId']['CITY'] ?? '',
-                    'LAST_COUNTY'        => $data['userByToUserId']['COUNTY'] ?? '',
+                    'LAST_PROVINCE'      => $data['userByToUserId']['PROVINCE'] ?? 0,
+                    'LAST_CITY'          => $data['userByToUserId']['CITY'] ?? 0,
+                    'LAST_COUNTY'        => $data['userByToUserId']['COUNTY'] ?? 0,
 
                     'LAST_DEC_DEC_LV'     => $data['userByUserId']['LAST_DEC_LV'] ?? '',
-                    'LAST_DEC_SUB_COM_ID' => $data['userByUserId']['SUB_COM_ID'] ?? '',
-                    'LAST_DEC_PROVINCE'   => $data['userByUserId']['PROVINCE'] ?? '',
-                    'LAST_DEC_CITY'       => $data['userByUserId']['CITY'] ?? '',
-                    'LAST_DEC_COUNTY'     => $data['userByUserId']['COUNTY'] ?? '',
+                    'LAST_DEC_SUB_COM_ID' => $data['userByUserId']['SUB_COM_ID'] ?? 0,
+                    'LAST_DEC_PROVINCE'   => $data['userByUserId']['PROVINCE'] ?? 0,
+                    'LAST_DEC_CITY'       => $data['userByUserId']['CITY'] ?? 0,
+                    'LAST_DEC_COUNTY'     => $data['userByUserId']['COUNTY'] ?? 0,
 
                     'PAY_TYPE'         => $data['PAID_WALLET'],
                     'FROM_TABLES'      => 'dec_order',
@@ -217,17 +217,17 @@ class GeneratePerfOrder extends BasePerfBusiness
                     'LAST_REC_REAL_NAME' => $data['recName']['recRealName']['REAL_NAME'] ?? '',
                     'LAST_DEC_LV'        => $data['userByUserId']['LAST_DEC_LV'] ?? '', //CalcCache 810
                     'LAST_EMP_LV'        => $data['userByUserId']['EMP_LV'] ?? '',
-                    'LAST_STATUS'        => $data['userByUserId']['STATUS'] ?? '',
+                    'LAST_STATUS'        => $data['userByUserId']['STATUS'] ?? 0,
                     'LAST_SUB_COM_ID'    => $data['userByUserId']['SUB_COM_ID'] ?? '',
-                    'LAST_PROVINCE'      => $data['userByUserId']['PROVINCE'] ?? '',
-                    'LAST_CITY'          => $data['userByUserId']['CITY'] ?? '',
-                    'LAST_COUNTY'        => $data['userByUserId']['COUNTY'] ?? '',
+                    'LAST_PROVINCE'      => $data['userByUserId']['PROVINCE'] ?? 0,
+                    'LAST_CITY'          => $data['userByUserId']['CITY'] ?? 0,
+                    'LAST_COUNTY'        => $data['userByUserId']['COUNTY'] ?? 0,
 
                     'LAST_DEC_DEC_LV'     => $data['userByUserId']['LAST_DEC_LV'] ?? '',
-                    'LAST_DEC_SUB_COM_ID' => $data['userByUserId']['SUB_COM_ID'] ?? '',
-                    'LAST_DEC_PROVINCE'   => $data['userByUserId']['PROVINCE'] ?? '',
-                    'LAST_DEC_CITY'       => $data['userByUserId']['CITY'] ?? '',
-                    'LAST_DEC_COUNTY'     => $data['userByUserId']['COUNTY'] ?? '',
+                    'LAST_DEC_SUB_COM_ID' => $data['userByUserId']['SUB_COM_ID'] ?? 0,
+                    'LAST_DEC_PROVINCE'   => $data['userByUserId']['PROVINCE'] ?? 0,
+                    'LAST_DEC_CITY'       => $data['userByUserId']['CITY'] ?? 0,
+                    'LAST_DEC_COUNTY'     => $data['userByUserId']['COUNTY'] ?? 0,
                     'DEC_USER_ID'         => $data['userByUserId']['DEC_ID'],
 
                     'PAY_TYPE'         => $data['PAY_TYPE'],
@@ -260,6 +260,7 @@ class GeneratePerfOrder extends BasePerfBusiness
 
     public function order(): bool
     {
+        echo "b";
         $_offset = 0;
         order:
         $allData = Order::find()->select('ID,SN,DEC_SN,USER_ID,ORDER_TYPE,ORDER_AMOUNT,PAY_AMOUNT,PAY_PV,PAY_TYPE,PERIOD_NUM,STATUS,IS_DELETE,P_CALC_MONTH,CREATED_AT')
@@ -303,17 +304,17 @@ class GeneratePerfOrder extends BasePerfBusiness
                     'LAST_REC_REAL_NAME' => $data['recName']['recRealName']['REAL_NAME'] ?? '',
                     'LAST_DEC_LV'        => $data['userByUserId']['LAST_DEC_LV'] ?? '', //CalcCache 810
                     'LAST_EMP_LV'        => $data['userByUserId']['EMP_LV'] ?? '',
-                    'LAST_STATUS'        => $data['userByUserId']['STATUS'] ?? '',
+                    'LAST_STATUS'        => $data['userByUserId']['STATUS'] ?? 0,
                     'LAST_SUB_COM_ID'    => $data['userByUserId']['SUB_COM_ID'] ?? '',
-                    'LAST_PROVINCE'      => $data['userByUserId']['PROVINCE'] ?? '',
-                    'LAST_CITY'          => $data['userByUserId']['CITY'] ?? '',
-                    'LAST_COUNTY'        => $data['userByUserId']['COUNTY'] ?? '',
+                    'LAST_PROVINCE'      => $data['userByUserId']['PROVINCE'] ?? 0,
+                    'LAST_CITY'          => $data['userByUserId']['CITY'] ?? 0,
+                    'LAST_COUNTY'        => $data['userByUserId']['COUNTY'] ?? 0,
 
                     'LAST_DEC_DEC_LV'     => $data['userByUserId']['LAST_DEC_LV'] ?? '',
-                    'LAST_DEC_SUB_COM_ID' => $data['userByUserId']['SUB_COM_ID'] ?? '',
-                    'LAST_DEC_PROVINCE'   => $data['userByUserId']['PROVINCE'] ?? '',
-                    'LAST_DEC_CITY'       => $data['userByUserId']['CITY'] ?? '',
-                    'LAST_DEC_COUNTY'     => $data['userByUserId']['COUNTY'] ?? '',
+                    'LAST_DEC_SUB_COM_ID' => $data['userByUserId']['SUB_COM_ID'] ?? 0,
+                    'LAST_DEC_PROVINCE'   => $data['userByUserId']['PROVINCE'] ?? 0,
+                    'LAST_DEC_CITY'       => $data['userByUserId']['CITY'] ?? 0,
+                    'LAST_DEC_COUNTY'     => $data['userByUserId']['COUNTY'] ?? 0,
                     'DEC_USER_ID'         => $data['USER_ID'],
 
                     'PAY_TYPE'         => $data['PAY_TYPE'],