edit

app/Http/Controllers/Api/SynJdPopDataController.php

@@ -213,7 +213,7 @@ class SynJdPopDataController extends BaseController
                             $fullAddress = $fullAddress??$vv['consigneeInfo']['fullAddress'];
                             $fullAddress = str_replace("'", '', $fullAddress);
                             $resjdgoods = DB::table('jdgoods')->where("order_id",$vv['orderId'])->value('id');
-                            $sys_num = 'L'.$v['pt_id'].'P'.$kk.date("YmdHis").str_pad(rand(0,999),3,'0',STR_PAD_LEFT);
+                            unset($orderMsgData);
                             foreach( $vv['itemInfoList'] as $ka => $va ){
                                 if(!$resjdgoods){
                                     $sql_dgoods .= "('".$vv['orderId']."',".$v['pt_id'].",'".$va['skuId']."','".$va['skuName']."','".$va['itemTotal']."','".$va['jdPrice']."','0'),";
@@ -232,6 +232,7 @@ class SynJdPopDataController extends BaseController
                                     unset($arr_goods[$kk]);
 
                                 }
+                                $sys_num = 'L'.$v['pt_id'].'P'.$kk.date("YmdHis").str_pad(rand(0,999),3,'0',STR_PAD_LEFT);
                                 if($flag==1) {
                                     $goodid = $goodids[$va['skuId']];
                                     if($goodid){
@@ -531,7 +532,8 @@ class SynJdPopDataController extends BaseController
         $decrypt_data = json_encode($data);
         $url = "http://jm.bluearp.com/jd/jdDecrypt?data=".$decrypt_data;
         $res = (string)$this->https_request($url);
-        CommonService::addLog('URL', $order_num.'---'.$url.'----'.$res, 111,'url');
+        $filename = 'url'.date('Ymd');
+        CommonService::addLog('URL', $order_num.'---'.$url.'----'.$res, 111,$filename);
         return $res;
     }
 

app/Services/DataStatisticsService.php

@@ -128,8 +128,15 @@ class DataStatisticsService extends Service{
         }
         if(isset($input['is_excel']) && $input['is_excel']==2 ){
             $time1 = date("Y.m.d", strtotime($input['time_start']));
-            $time2 = date("Y.m.d", strtotime($input['time_start'] . " +6 day"));
-            $excel['time'] = "本周".$time1."-".$time2;
+            if($input['search_type'] == 'week') {
+                $timeshow = '本周';
+                $time_end = date("Y-m-d", strtotime($input['time_start'] . " +7 day"));
+            }if($input['search_type'] == 'month') {
+                $timeshow = '本月';
+                $time_end = date("Y-m-d", strtotime($input['time_start'] . " +1 month"));
+            }
+            $time2 = date("Y.m.d", strtotime($time_end . " -1 day"));
+            $excel['time'] = $timeshow.$time1."-".$time2;
             $excel['data'] = $return;
             $excel['session'] = $session;
             $exporter = New BasicExport();