订单电话的 ctl1和ctl2同时采用

app/Http/Controllers/OrderController.php

@@ -100,7 +100,7 @@ class OrderController extends Controller
                     'logistic_number_return' => $orderno,
                     'id_logistic_return' => $logistic->id,
                     'order_number' => $order->soreference1,
-                    'mobile_sender' => $order->c_tel2,
+                    'mobile_sender' => empty($order->c_tel2)?$order->c_tel1:$order->c_tel2,
                     'logistic_number' => '原单退回',//$order->soreference1
                     'remark' => $order->notes,
                     'is_loaded' =>0,

app/Http/Controllers/RejectedBillController.php

@@ -273,7 +273,7 @@ class RejectedBillController extends Controller
 
     function seekOrder(Request $request){
         if (!$request->soreference5)return ['success'=>false];
-        $order=OracleDOCOrderHeader::select('soreference1','customerid','c_contact','c_tel2','carrierid')->where('soreference5',$request->soreference5)->first();
+        $order=OracleDOCOrderHeader::select('soreference1','customerid','c_contact','c_tel2','c_tel1','carrierid')->where('soreference5',$request->soreference5)->first();
         if ($order)return ['success'=>true,'data'=>$order];
     }
 }

app/Services/OrderService.php

@@ -64,7 +64,7 @@ class OrderService
             $sql .= " AND c_contact like '".$c_contact."'";
         }
         if ($c_tel2){
-            $sql .= " AND c_tel2 like '".$c_tel2."'";
+            $sql .= " AND (c_tel2 like '".$c_tel2."' OR c_tel1 like '".$c_tel2."')";
         }
         if ($c_province){
             $sql .= " AND c_province like '".$c_province."'";
@@ -200,7 +200,7 @@ class OrderService
             $params['ordernos'] = $ordernos;
         }
         $sql="select ACT_ALLOCATION_DETAILS.picktotraceid,ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
-        ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,DOC_ORDER_HEADER.EDIREMARKS2,
+        ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,DOC_ORDER_HEADER.EDIREMARKS2,
        DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
         ,DOC_ORDER_HEADER.soreference5,DOC_ORDER_HEADER.EDISENDFLAG2,DOC_ORDER_HEADER.EDISendTime2,DOC_ORDER_HEADER.Notes,DOC_ORDER_HEADER.ERPCANCELFLAG,
        DOC_ORDER_HEADER.Picking_Print_Flag,DOC_ORDER_HEADER.EDISENDFLAG
@@ -212,7 +212,7 @@ class OrderService
         ;$sql.=" ) as counted from (";
         if ($paginate && $page)$sql.=" select * from (";
         $sql.=" select ROWNUM as rn,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
-                          ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
+                          ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
                          DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1
                           ,DOC_ORDER_HEADER.soreference5,DOC_ORDER_HEADER.EDISENDFLAG2,DOC_ORDER_HEADER.EDISendTime2,DOC_ORDER_HEADER.Notes,DOC_ORDER_HEADER.ERPCANCELFLAG,
                          DOC_ORDER_HEADER.Picking_Print_Flag,DOC_ORDER_HEADER.EDISENDFLAG
@@ -243,7 +243,7 @@ class OrderService
                       DOC_Order_Details.orderlineno=ACT_ALLOCATION_DETAILS.orderlineno GROUP BY ACT_ALLOCATION_DETAILS.picktotraceid,
                       ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,
                       DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,
-                      DOC_ORDER_HEADER.CustomerID,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
+                      DOC_ORDER_HEADER.CustomerID,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,
                       DOC_ORDER_HEADER.EDIREMARKS2,DOC_ORDER_HEADER.WaveNo,DOC_ORDER_HEADER.SOReference1, DOC_ORDER_HEADER.soreference5,
                       DOC_ORDER_HEADER.EDISENDFLAG2,DOC_ORDER_HEADER.EDISendTime2,DOC_ORDER_HEADER.Notes,DOC_ORDER_HEADER.ERPCANCELFLAG,
                       DOC_ORDER_HEADER.Picking_Print_Flag,DOC_ORDER_HEADER.EDISENDFLAG,DOC_ORDER_HEADER.ReleaseStatus,DOC_ORDER_HEADER.C_Address1,
@@ -368,7 +368,7 @@ class OrderService
                 'logistic_id' => $logistics_id,
                 'shop_id' => $shop_Id,
                 'consignee_name' => $orderHeadAttr['c_contact'],
-                'consignee_phone' => $orderHeadAttr['c_tel2'],
+                'consignee_phone' => empty($orderHeadAttr['c_tel2'])?$orderHeadAttr['c_tel1']:$orderHeadAttr['c_tel2'],
                 'province' => $orderHeadAttr['c_province'],
                 'city' => $orderHeadAttr['c_city'],
                 'district' => $orderHeadAttr['c_district'],
@@ -465,7 +465,7 @@ class OrderService
             'logistic_id' => $logistics ? $logistics->id : null,
             'shop_id' => $shop ? $shop->id : null,
             'consignee_name' => $orderHeader->c_contact,
-            'consignee_phone' => $orderHeader->c_tel2,
+            'consignee_phone' => empty($orderHeader->c_tel2)?$orderHeader->c_tel1:$orderHeader->c_tel2,
             'province' => $orderHeader->c_province,
             'city' => $orderHeader->c_city,
             'district' => $orderHeader->c_district,
@@ -555,7 +555,7 @@ class OrderService
                 'logistic_id' => $logistic->id ?? null,
                 'shop_id' => $shop->id ?? null,
                 'consignee_name' => $orderHeader->c_contact,
-                'consignee_phone' => $orderHeader->c_tel2,
+                'consignee_phone' => empty($orderHeader->c_tel2)?$orderHeader->c_tel1:$orderHeader->c_tel2,
                 'province' => $orderHeader->c_province,
                 'city' => $orderHeader->c_city,
                 'district' => $orderHeader->c_district,
@@ -621,7 +621,7 @@ class OrderService
                 $order->shop_id != $shop_id ||
                 $order->owner_id != $owner_id ||
                 $order->consignee_name != $orderHeader->c_contact ||
-                $order->consignee_phone != $orderHeader->c_tel2 ||
+                $order->consignee_phone != empty($orderHeader->c_tel2)?$orderHeader->c_tel1:$orderHeader->c_tel2 ||
                 $order->province != $orderHeader->c_province ||
                 $order->city != $orderHeader->c_city ||
                 $order->district != $orderHeader->c_district ||
@@ -636,7 +636,7 @@ class OrderService
                     'logistic_id' => $logistic_id,
                     'shop_id' => $shop_id,
                     'consignee_name' => $orderHeader->c_contact,
-                    'consignee_phone' => $orderHeader->c_tel2,
+                    'consignee_phone' => empty($orderHeader->c_tel2)?$orderHeader->c_tel1:$orderHeader->c_tel2,
                     'province' => $orderHeader->c_province,
                     'city' => $orderHeader->c_city,
                     'district' => $orderHeader->c_district,
@@ -687,7 +687,7 @@ class OrderService
             'shop_id' =>$shop->id,
             'logistic_id' => $logistic->id ??'',
             'consignee_name' =>  $orderHeader->c_contact,
-            'consignee_phone' =>  $orderHeader->c_tel2,
+            'consignee_phone' =>  empty($orderHeader->c_tel2)?$orderHeader->c_tel1:$orderHeader->c_tel2,
             'province' =>$orderHeader->c_province,
             'city' => $orderHeader->c_city,
             'district' =>$orderHeader->c_district,

public/t.php

@@ -1,6 +1,5 @@
 <?php
 
-$res=array();
-$str="你好aaaaa啊";
-preg_match_all("/[\x{4e00}-\x{9fa5}]+/u",$str,$res);
-var_dump($res);
+$str='qq';
+$a=empty($str2)?'xx':'';
+var_dump($a);

resources/views/order/index/delivering.blade.php

@@ -91,7 +91,7 @@
                             <span v-else>@{{ order.soreference5 }}</span>
                         </td>
                         <td class="text-muted text-nowrap">@{{ order.c_contact }}</td>
-                        <td class="text-muted text-nowrap">@{{ order.c_tel2 }}</td>
+                        <td class="text-muted text-nowrap">@{{ order.c_tel2?order.c_tel2:order.c_tel1 }}</td>
                         <td class="text-nowrap"> @{{ order.c_province }}</td>
                         <td class="text-nowrap"> @{{ order.c_city }}</td>
                         <td class="text-nowrap"> @{{ order.c_district }}</td>
@@ -809,8 +809,9 @@
                     let content = ''
                     let _this = this
                     this.tagOrders.forEach(order=>{
-                        content+=_this.getOrderLogisticNumbers(order)
-                        content+=' '+order.c_contact+order.c_tel2+order.c_province+order.c_city+' '+order.c_district+order.c_address1+'\n'+_this.result_explain+"\n"
+                        content+=_this.getOrderLogisticNumbers(order);
+                        let tel=order.c_tel2?order.c_tel2:order.c_tel1;
+                        content+=' '+order.c_contact+tel+order.c_province+order.c_city+' '+order.c_district+order.c_address1+'\n'+_this.result_explain+"\n"
                     })
                     this.tagOrder.logisticInfo = content
                 },

serves/excelExportGo/api/controller/orderController.go

@@ -69,6 +69,10 @@ func OrderFormat(data []map[string]string) ([]interface{}, [][]interface{}, map[
 				line[value] = utilities.DateFormat(v[key], "2006-01-02T15:04:05+08:00")
 				continue
 			}
+			if key == "C_TEL2" && v[key]=="" {
+				line[value] = v["C_TEL1"]
+				continue
+			}
 			line[value] = v[key]
 		}
 		list[k] = line