ソースを参照

提交商铺换行问题

ajun 4 年 前
コミット
669dbb11d1
1 ファイル変更5 行追加4 行削除
  1. 5 4
      app/Services/OrderService.php

+ 5 - 4
app/Services/OrderService.php

@@ -670,9 +670,9 @@ class OrderService
             if(!empty($orderHeader['userdefine1']))
                 $logistic_codes[$orderHeader['userdefine1']] = $orderHeader['userdefine1'];
             if(!empty($orderHeader['issuepartyname']) && !empty($orderHeader['customerid'])){
-                $issuePartyName = str_replace("\n", ' ', $orderHeader['issuepartyname']);
-                $value = ['owner_code'=>$orderHeader['customerid'],'issuepartyname'=>$issuePartyName];
-                $key = "owner_code_{$orderHeader['customerid']}_issuepartyname_{$issuePartyName}";
+                $shop_name = str_replace("\n", ' ', $orderHeader['issuepartyname']);
+                $value = ['owner_code'=>$orderHeader['customerid'],'issuepartyname'=>$shop_name];
+                $key = "owner_code_{$orderHeader['customerid']}_issuepartyname_{$shop_name}";
                 $shop_names[$key] = $value;
             }
         }
@@ -786,7 +786,8 @@ class OrderService
         $batch = $dataHandlerService->getKeyValue(['code'=>$orderHeader->waveno],$batch_map);
         $shop['id'] = null;
         if($orderHeader->issuepartyname != null && $orderHeader->issuepartyname != '' ){
-            $shop = $dataHandlerService->getKeyValue(['name'=>$orderHeader->issuepartyname ?? '','owner_id'=>$owner->id??''],$shop_map);
+            $shop_name = str_replace("\n", ' ', $orderHeader->issuepartyname);
+            $shop = $dataHandlerService->getKeyValue(['name'=>$shop_name ?? '','owner_id'=>$owner->id??''],$shop_map);
         }
         if(!$batch['id']&&!($orderHeader['status']==90||$orderHeader['status']==00)&&$orderHeader['wave_no']!='*'){
             LogService::log(__METHOD__,__FUNCTION__,'波次为空: code='.$orderHeader['orderno']);