发件接口参数调整

lib/pages/order_management_page.dart

@@ -82,7 +82,7 @@ class _QueryWidgetState extends State < QueryWidget > {
     switchOrderFromStatus(orderStatus, page);
     _scrollController.addListener(() {
       if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent) {
-        if(loadMoreStatus){
+        if (loadMoreStatus) {
           page = ++page;
           getMoreOrder(orderStatus, page);
         }
@@ -136,12 +136,12 @@ class _QueryWidgetState extends State < QueryWidget > {
                                 setState(() {
                                   _orderNo = value;
                                 });
-                                if (_orderNo.length >= 6) {
-                                  if (timer != null) {
-                                    timer.cancel();
-                                  }
-                                  timer = Timer(Duration(milliseconds: 500), () {
-                                    orderNoLike(_orderNo).then((resp) {
+                                if (timer != null) {
+                                  timer.cancel();
+                                }
+                                timer = Timer(Duration(milliseconds: 500), () {
+                                  if (_orderNo.length >= 6) {
+                                    orderNoLike(_orderNo, orderStatus).then((resp) {
                                       if (isNotError(context, resp)) {
                                         LikeOrderNo tempObj = LikeOrderNo.fromJson(resp.data);
                                         if (tempObj.data.length > 0) {
@@ -152,12 +152,13 @@ class _QueryWidgetState extends State < QueryWidget > {
                                         }
                                       }
                                     });
-                                  });
-                                } else {
-                                  setState(() {
-                                    showStatus = true;
-                                  });
-                                }
+                                  } else {
+                                    setState(() {
+                                      showStatus = true;
+                                    });
+                                  }
+                                });
+
                               }),
                               onEditingComplete: () {
                                 FocusScope.of(context).requestFocus(FocusNode());
@@ -756,7 +757,7 @@ class _QueryWidgetState extends State < QueryWidget > {
     if (!hasNextPage) {
       return;
     }
-    loadMoreStatus =false;
+    loadMoreStatus = false;
     fromStatusGetOrderList(orderStatus, page).then((resp) {
       if (isNotError(context, resp)) {
         FromStatusGetOrderObj tempObj = FromStatusGetOrderObj.fromJson(resp.data);
@@ -765,7 +766,7 @@ class _QueryWidgetState extends State < QueryWidget > {
           hasNextPage = tempObj.data.hasNextPage;
         });
         loadMoreStatus = true;
-      }else{
+      } else {
         loadMoreStatus = true;
       }
     });

lib/pages/order_management_page/order_detail_page.dart

@@ -68,7 +68,7 @@ class _OrderDetailPageState extends State < OrderDetailPage > {
           contentWiget('电话', orderDetailObj.senderPhone),
           contentWiget('企业编码', orderDetailObj.sendCompanyCode),
           contentWiget('企业名称', orderDetailObj.sendCompanyName),
-          contentWiget('城市/区域', '${orderDetailObj.sendCompanyProvinceName}' '${orderDetailObj.sendCompanyCityName}' '${orderDetailObj.sendCompanyAreaName}'),
+          contentWiget('城市/区域', '${orderDetailObj.sendCompanyProvinceName}'+' '+'${orderDetailObj.sendCompanyCityName}'+' '+ '${orderDetailObj.sendCompanyAreaName}'),
           lastContentWiget('详细地址', orderDetailObj.sendCompanyAddress)
         ],
       )
@@ -85,7 +85,7 @@ class _OrderDetailPageState extends State < OrderDetailPage > {
           underLine(),
           contentWiget('企业名称', orderDetailObj.receiptCompanyName),
           contentWiget('电话', orderDetailObj.receiptCompanyPhone),
-          contentWiget('城市/区域', '${orderDetailObj.receiptCompanyProvinceName}' '${orderDetailObj.receiptCompanyCityName}' '${orderDetailObj.receiptCompanyAreaName}'),
+          contentWiget('城市/区域', '${orderDetailObj.receiptCompanyProvinceName}'+' '+ '${orderDetailObj.receiptCompanyCityName}'+' '+ '${orderDetailObj.receiptCompanyAreaName}'),
           lastContentWiget('详细地址', orderDetailObj.sendCompanyAddress)
         ],
       )

lib/pages/send_express_page.dart

@@ -53,7 +53,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
   List < dynamic > goodsCateGoryList = [];
   List < dynamic > goodsPackageList = [];
   //请求字段-------------------------
-  int sendCompanyId; //寄件公司Id
+  String sendCompanyId = '0'; //寄件公司Id
   String sendCompanyName = ''; //寄件公司名称 不能为空
   String sendCompanyPhone = ''; //寄件公司电话 不能为空
   String sendCompanyCode = ''; //寄件公司编码 
@@ -64,7 +64,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
   String sendCompanyAreaName = ''; //寄件公司区名称 不能为空
   String sendCompanyAreaCode = ''; //寄件公司区编码 不能为空
   String sendCompanyAddress = ''; //寄件公司详细地址，不能为空
-  int receiptCompanyId; //收件公司id
+  String receiptCompanyId='0'; //收件公司id
   String receiptCompanyPhone = ''; //收件公司电话 不能为空
   String receiptCompanyName = ''; //收件公司名称 不能为空
   String receiptCompanyProvinceName = ''; //收件公司省名称 不能为空
@@ -747,7 +747,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
           submitStatus = false;
         });
         createOrder(
-          sendCompanyId ?? "", //寄件公司Id
+          sendCompanyId, //寄件公司Id
           sendCompanyName, //寄件公司名称 不能为空
           sendCompanyPhone, //寄件公司电话 不能为空
           sendCompanyCode ?? '', //寄件公司编码 
@@ -802,7 +802,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
               });
           } else {
             setState(() {
-              submitStatus = false;
+              submitStatus = true;
             });
           }
         });
@@ -872,7 +872,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                 sendCompanyPhone = obj.uzerPhone;
                 sendCompanyCode = obj.companyCode;
                 sendCompanyName = obj.companyName;
-                sendCompanyId = obj.id;
+                sendCompanyId = obj.id.toString();
                 sendCompanyPhoneController.text = obj.uzerPhone;
                 sendCompanyCodeController.text = obj.companyCode;
                 sendCompanyNameController.text = obj.companyName;
@@ -881,7 +881,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                 receiptCompanyName = obj.companyName;
                 receiptCompanyPhoneController.text = obj.uzerPhone;
                 receiptCompanyNameController.text = obj.companyName;
-                receiptCompanyId = obj.id;
+                receiptCompanyId = obj.id.toString();
               }
               setState(() {
                 FocusScope.of(context).requestFocus(FocusNode());

lib/pages/send_express_page/order_detail_page.dart

@@ -131,7 +131,7 @@ class _OrderDetailState extends State < OrderDetail > {
                           return new LoadingDialog( //调用对话框
                             text: '是否确认作废', childCallback: (val) {
                               if (val) {
-                                //widget.callback(widget.index);
+                                myUpdataOrder(5);
                               } else {
                                 return;
                               }
@@ -164,7 +164,7 @@ class _OrderDetailState extends State < OrderDetail > {
                           return new LoadingDialog( //调用对话框
                             text: '是否确认拒收', childCallback: (val) {
                               if (val) {
-                                //widget.callback(widget.index);
+                               myUpdataOrder(4);
                               } else {
                                 return;
                               }
@@ -197,7 +197,7 @@ class _OrderDetailState extends State < OrderDetail > {
                           return new LoadingDialog( //调用对话框
                             text: '是否确认签收', childCallback: (val) {
                               if (val) {
-                                //widget.callback(widget.index);
+                               myUpdataOrder(3);
                               } else {
                                 return;
                               }
@@ -311,4 +311,12 @@ class _OrderDetailState extends State < OrderDetail > {
       ),
     );
   }
+
+    myUpdataOrder(int myOrderStatus) {
+    updataOrderStatus(data.orderNo, myOrderStatus).then((resp) {
+      if (isNotError(context, resp)) {
+       
+      }
+    });
+  }
 }

lib/util/api.dart

@@ -47,7 +47,7 @@ Future updataPasswrod(oldPassword, newPassword) async {
 
 //发件(创建订单)
 Future createOrder(
-  int sendCompanyId, //寄件公司Id
+  String sendCompanyId, //寄件公司Id
   String sendCompanyName, //寄件公司名称 不能为空
   String sendCompanyPhone, //寄件公司电话 不能为空
   String sendCompanyCode, //寄件公司编码 
@@ -58,7 +58,7 @@ Future createOrder(
   String sendCompanyAreaName, //寄件公司区名称 不能为空
   String sendCompanyAreaCode, //寄件公司区编码 不能为空
   String sendCompanyAddress, //寄件公司详细地址，不能为空
-  int receiptCompanyId, //收件公司id
+  String receiptCompanyId, //收件公司id
   String receiptCompanyPhone, //收件公司电话 不能为空
   String receiptCompanyName, //收件公司名称 不能为空
   String receiptCompanyProvinceName, //收件公司省名称 不能为空
@@ -182,9 +182,10 @@ Future updataOrderStatus(String orderNo, int orderStatus) {
 }
 
 //模糊匹配订单号
-Future orderNoLike(String orderNo) {
+Future orderNoLike(String orderNo,int orderStatus) {
   var response = Http().get('app/order/order_no_like', data: {
-    'orderNo': orderNo
+    'orderNo': orderNo,
+    'orderStatus':orderStatus
   });
   return response;
 }

lib/util/models.dart

@@ -583,7 +583,7 @@ class OrderDetailData {
       sendCompanyAreaName: json['sendCompanyAreaName'],
       sendCompanyBankCard: json['sendCompanyBankCard'],
       sendCompanyCityCode: json['sendCompanyCityCode'],
-      sendCompanyCityName: json['sendCompanyCityName '],
+      sendCompanyCityName: json['sendCompanyCityName'],
       sendCompanyId: json['sendCompanyId'],
       sendCompanyName: json['sendCompanyName'],
       sendCompanyCode: json['sendCompanyCode'],

lib/util/request.dart

@@ -76,7 +76,7 @@ class Http {
       }
       return e;
     }
-    //print(response);
+    //print(response.data);
     return response;
   }
 
@@ -105,6 +105,7 @@ class Http {
       }
       return e;
     }
+    print(response);
     return response;
   }
 }