客服系统 阶段性提交6 [退回订单，订单号同步问题] by 'zengjun'

app/Http/Controllers/OrderIssueController.php

@@ -428,7 +428,11 @@ class OrderIssueController extends Controller
                 return ['success' => true, 'data' => compact(['order', 'rejectedBill'])];
             }
         } else if ($request->input('type') == 'RejectedBill') {
-            $bool = OrderIssue::where('rejected_bill_id', $request->input('id'))->count() > 0;
+            $rejectedBill = RejectedBill::where('logistic_number_return',$request->input('id'))->first();
+            if(!$rejectedBill){
+                return  ['success' => false, 'fail_info' => '没有对应的问题单号'];
+            }
+            $bool = OrderIssue::where('rejected_bill_id',$rejectedBill['id'] )->count() > 0;
             if ($bool) {
                 return ['success' => false, 'fail_info' => '退回单号已有对应的问题单'];
             } else {

app/Services/OrderService.php

@@ -41,15 +41,13 @@ class OrderService
                 $shop = Shop::firstOrCreate(['name' => $shop_name, 'owner_id' => $owner_id]);
                 $shop_Id = $shop->id;
             }
-
-            $logistics = Logistic::where(['name' => $orderHeadAttr['carrierid']])->first();
-            if ($logistics == null) {
-                $oracleBasCustomer = OracleBasCustomer::where(['CustomerID' => $orderHeadAttr['carrierid'], 'Customer_Type' => 'CA'])->first();
+            $logistics = Logistic::where(['name' => $orderHeadAttr['CarrierName']])->first();
+/*            if ($logistics == null) {
+                $oracleBasCustomer = OracleBasCustomer::where(['Descr_C' => $orderHeadAttr['CarrierName'], 'Customer_Type' => 'CA'])->first();
                 if ($oracleBasCustomer) {
                     $logistics = Logistic::firstOrCreate(['code' => $oracleBasCustomer->customerid, 'name' => $oracleBasCustomer->descr_c]);
                 }
-            }
-
+            }*/
             $logistics_id = null;
             if ($logistics) {
                 $logistics_id = $logistics->id;

resources/views/order/issue/create.blade.php

@@ -41,9 +41,7 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="order_issue_type_id"
-                                   class="col-2 col-form-label text-right text-primary"><span
-                                    class="text-danger">*</span>问题类别</label>
+                            <label for="order_issue_type_id" class="col-2 col-form-label text-right text-primary"><span class="text-danger">*</span>问题类别</label>
                             <div class="col-8">
                                 <select name="order_issue_type_id" id="order_issue_type_id"
                                         class="form-control @error('order_issue_type_id') is-invalid @enderror" v-model="order_issue_type_id">
@@ -101,14 +99,14 @@
                                         <td>@{{ item.barcode_goods }}</td>
                                         <td>@{{ item.name_goods }}</td>
                                         <td>@{{ item.amount }}</td>
-                                        <td>@{{ item.name_goods }}</td>
+                                        <td>@{{ item.validity_at }}</td>
                                         <td>@{{ item.remark }}</td>
                                     </tr>
                                 </table>
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="wms_order_no" class="col-2 col-form-label text-right ">货主</label>
+                            <label for="wms_order_no" class="col-2 col-form-label text-right text-primary"><span class="text-danger">*</span>货主</label>
                             <div class="col-8 row">
                                 <div class="form-group col-lg-5">
                                     <select class="form-control @error('owner_id') is-invalid @enderror" name="owner_id" v-model="order.owner_id" >
@@ -122,7 +120,7 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="wms_order_no" class="col-2 col-form-label text-right text-primary">原始承运商</label>
+                            <label for="wms_order_no" class="col-2 col-form-label text-right ">原始承运商</label>
                             <div class="col-8 row">
                                 <div class="form-group col-lg-5">
                                     <select class="form-control " name="logistic_id" v-model="order.logistic_id">