Parcourir la source

接单接口 改单接口

daxu0403 il y a 7 ans
Parent
commit
e734bf7d4c

BIN
android/.gradle/4.10.2/fileHashes/fileHashes.bin


BIN
android/.gradle/4.10.2/fileHashes/fileHashes.lock


BIN
android/.gradle/4.10.2/taskHistory/taskHistory.bin


BIN
android/.gradle/4.10.2/taskHistory/taskHistory.lock


BIN
android/.gradle/buildOutputCleanup/buildOutputCleanup.lock


+ 125 - 112
lib/pages/order_management_page.dart

@@ -56,7 +56,7 @@ class QueryWidget extends StatefulWidget { //搜索栏
 class _QueryWidgetState extends State < QueryWidget > {
   //单号的输入框控制器
   TextEditingController _orderController = TextEditingController();
-  ScrollController _scrollController =ScrollController();
+  ScrollController _scrollController = ScrollController();
 
   GlobalKey _globalKey = GlobalKey(); //搜索栏key
   List < bool > statusList = [true, false, false];
@@ -69,14 +69,14 @@ class _QueryWidgetState extends State < QueryWidget > {
   int orderStatus = 1; //0:代收单,1:待取件,2:运途中:已完成
   int page = 1;
   bool hasNextPage = true;
-  List<FromStatusGetOrderList> orderList=[];
+  List < FromStatusGetOrderList > orderList = [];
 
 
   @override
   void initState() {
     super.initState();
     switchOrderFromStatus(orderStatus, page);
-    _scrollController.addListener((){
+    _scrollController.addListener(() {
       if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent) {
         print("滑到底部了");
       }
@@ -195,7 +195,9 @@ class _QueryWidgetState extends State < QueryWidget > {
                                 } else {
                                   setState(() {
                                     statusList = [true, false, false];
+                                    orderStatus = 1;
                                   });
+                                  switchOrderFromStatus(orderStatus, page);
                                 }
                               },
                             ),
@@ -215,7 +217,9 @@ class _QueryWidgetState extends State < QueryWidget > {
                                 } else {
                                   setState(() {
                                     statusList = [false, true, false];
+                                    orderStatus = 2;
                                   });
+                                  switchOrderFromStatus(orderStatus, page);
                                 }
                               },
                             ),
@@ -235,7 +239,9 @@ class _QueryWidgetState extends State < QueryWidget > {
                                 } else {
                                   setState(() {
                                     statusList = [false, false, true];
+                                    orderStatus = 3;
                                   });
+                                  switchOrderFromStatus(orderStatus, page);
                                 }
                               },
                             ),
@@ -249,29 +255,22 @@ class _QueryWidgetState extends State < QueryWidget > {
               Expanded(
                 child: Container(
                   padding: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(20), ScreenUtil.getInstance().setWidth(20), ScreenUtil.getInstance().setWidth(20), 0),
-                  child: 
-                  // ListView(
-                  //   controller: _scrollController,
-                  //   children: < Widget > [
-                  //     _cardWiget(),
-                  //     _cardWiget(),
-                  //     _cardWiget(),
-                  //   ],
-                  // ),
+                  child: orderList.length == 0 ? Center(
+                    child: Text('暂无订单')
+                  ) :
                   ListView.builder(
-                  controller:_scrollController,
-                  itemCount: orderList.length,
-                  itemBuilder: (BuildContext context,int index){
-                    if(index<orderList.length){
-                      return _cardWiget(orderList[index]);
-                    }
-                    if (hasNextPage) {
+                    controller: _scrollController,
+                    itemCount: orderList.length + 1,
+                    itemBuilder: (BuildContext context, int index) {
+                      if (index < orderList.length) {
+                        return _cardWiget(orderList[index]);
+                      }
+                      if (hasNextPage) {
                         return _getMoreWidget();
                       } else {
                         return _noMoreWidegt();
                       }
-                    
-                  },
+                    },
                   )
                 ),
               )
@@ -318,11 +317,11 @@ class _QueryWidgetState extends State < QueryWidget > {
     );
   }
   Widget _cardWiget(FromStatusGetOrderList obj) {
-    Map<int,String> statusMap={
-      1:'待取货',
-      2:'运途中',
-      3:'已签收',
-      4:'拒收'
+    Map < int, String > statusMap = {
+      1: '待取货',
+      2: '运途中',
+      3: '已签收',
+      4: '拒收'
     };
     return GestureDetector(
       child: Card(
@@ -400,19 +399,19 @@ class _QueryWidgetState extends State < QueryWidget > {
                     ),
                     onTap: () {
                       showDialog < Null > (
-                      context: context, //BuildContext对象
-                      barrierDismissible: false,
-                      builder: (BuildContext context) {
-                        return new LoadingDialog( //调用对话框
-                          text:'是否确认作废',childCallback: (val){
-                            if(val){
-                              //widget.callback(widget.index);
-                            }else{
-                              return;
-                            }
-                          },
-                        );
-                      });
+                        context: context, //BuildContext对象
+                        barrierDismissible: false,
+                        builder: (BuildContext context) {
+                          return new LoadingDialog( //调用对话框
+                            text: '是否确认作废', childCallback: (val) {
+                              if (val) {
+                                //widget.callback(widget.index);
+                              } else {
+                                return;
+                              }
+                            },
+                          );
+                        });
                       print("作废");
                     },
                   ),
@@ -433,19 +432,19 @@ class _QueryWidgetState extends State < QueryWidget > {
                     ),
                     onTap: () {
                       showDialog < Null > (
-                      context: context, //BuildContext对象
-                      barrierDismissible: false,
-                      builder: (BuildContext context) {
-                        return new LoadingDialog( //调用对话框
-                          text:'是否确认寄件',childCallback: (val){
-                            if(val){
-                              //widget.callback(widget.index);
-                            }else{
-                              return;
-                            }
-                          },
-                        );
-                      });
+                        context: context, //BuildContext对象
+                        barrierDismissible: false,
+                        builder: (BuildContext context) {
+                          return new LoadingDialog( //调用对话框
+                            text: '是否确认寄件', childCallback: (val) {
+                              if (val) {
+                                //widget.callback(widget.index);
+                              } else {
+                                return;
+                              }
+                            },
+                          );
+                        });
                       print("寄件");
                     },
                   ),
@@ -466,19 +465,19 @@ class _QueryWidgetState extends State < QueryWidget > {
                     ),
                     onTap: () {
                       showDialog < Null > (
-                      context: context, //BuildContext对象
-                      barrierDismissible: false,
-                      builder: (BuildContext context) {
-                        return new LoadingDialog( //调用对话框
-                          text:'是否确认拒收',childCallback: (val){
-                            if(val){
-                              //widget.callback(widget.index);
-                            }else{
-                              return;
-                            }
-                          },
-                        );
-                      });
+                        context: context, //BuildContext对象
+                        barrierDismissible: false,
+                        builder: (BuildContext context) {
+                          return new LoadingDialog( //调用对话框
+                            text: '是否确认拒收', childCallback: (val) {
+                              if (val) {
+                                //widget.callback(widget.index);
+                              } else {
+                                return;
+                              }
+                            },
+                          );
+                        });
                       print("拒收");
                     },
                   ),
@@ -499,19 +498,19 @@ class _QueryWidgetState extends State < QueryWidget > {
                     ),
                     onTap: () {
                       showDialog < Null > (
-                      context: context, //BuildContext对象
-                      barrierDismissible: false,
-                      builder: (BuildContext context) {
-                        return new LoadingDialog( //调用对话框
-                          text:'是否确认签收',childCallback: (val){
-                            if(val){
-                              //widget.callback(widget.index);
-                            }else{
-                              return;
-                            }
-                          },
-                        );
-                      });
+                        context: context, //BuildContext对象
+                        barrierDismissible: false,
+                        builder: (BuildContext context) {
+                          return new LoadingDialog( //调用对话框
+                            text: '是否确认签收', childCallback: (val) {
+                              if (val) {
+                                //widget.callback(widget.index);
+                              } else {
+                                return;
+                              }
+                            },
+                          );
+                        });
                       print("签收");
                     },
                   ),
@@ -532,22 +531,22 @@ class _QueryWidgetState extends State < QueryWidget > {
                     ),
                     onTap: () {
                       showDialog < Null > (
-                      context: context, //BuildContext对象
-                      barrierDismissible: false,
-                      builder: (BuildContext context) {
-                        return new LoadingDialog( //调用对话框
-                          text:'是否确认改单',childCallback: (val){
-                            if(val){
-                              print(val);
-                               Navigator.push(context, MaterialPageRoute(builder: (context) {
-                                  return OrderDetailPage(orderId: 123456, );
+                        context: context, //BuildContext对象
+                        barrierDismissible: false,
+                        builder: (BuildContext context) {
+                          return new LoadingDialog( //调用对话框
+                            text: '是否确认改单', childCallback: (val) {
+                              if (val) {
+                                print(val);
+                                Navigator.push(context, MaterialPageRoute(builder: (context) {
+                                  return OrderDetailPage(orderNo: obj.orderNo, );
                                 }));
-                            }else{
-                              return;
-                            }
-                          },
-                        );
-                      });
+                              } else {
+                                return;
+                              }
+                            },
+                          );
+                        });
                       print("改单");
                     },
                   ),
@@ -568,19 +567,19 @@ class _QueryWidgetState extends State < QueryWidget > {
                     ),
                     onTap: () {
                       showDialog < Null > (
-                      context: context, //BuildContext对象
-                      barrierDismissible: false,
-                      builder: (BuildContext context) {
-                        return new LoadingDialog( //调用对话框
-                          text:'是否确认打印',childCallback: (val){
-                            if(val){
-                              //widget.callback(widget.index);
-                            }else{
-                              return;
-                            }
-                          },
-                        );
-                      });
+                        context: context, //BuildContext对象
+                        barrierDismissible: false,
+                        builder: (BuildContext context) {
+                          return new LoadingDialog( //调用对话框
+                            text: '是否确认打印', childCallback: (val) {
+                              if (val) {
+                                //widget.callback(widget.index);
+                              } else {
+                                return;
+                              }
+                            },
+                          );
+                        });
                       print("打印");
                     },
                   ),
@@ -591,18 +590,32 @@ class _QueryWidgetState extends State < QueryWidget > {
         )
       ),
       onTap: () {
-       
+
       },
     );
   }
 
-  switchOrderFromStatus(int orderStatus,int page){
-    fromStatusGetOrderList(orderStatus,page).then((resp){
-      print(resp);
-      if(isNotError(context, resp)){
+  switchOrderFromStatus(int orderStatus, int page) {
+    fromStatusGetOrderList(orderStatus, page).then((resp) {
+      if (isNotError(context, resp)) {
+        FromStatusGetOrderObj tempObj = FromStatusGetOrderObj.fromJson(resp.data);
+        setState(() {
+          orderList = tempObj.data.items;
+          hasNextPage = tempObj.data.hasNextPage;
+        });
+      }
+    });
+  }
+  getMoreOrder(int orderStatus, int page) {
+    if (!hasNextPage) {
+      return;
+    }
+    fromStatusGetOrderList(orderStatus, page).then((resp) {
+      if (isNotError(context, resp)) {
         FromStatusGetOrderObj tempObj = FromStatusGetOrderObj.fromJson(resp.data);
         setState(() {
-          orderList =tempObj.data.items;
+          orderList.addAll(tempObj.data.items);
+          hasNextPage = tempObj.data.hasNextPage;
         });
       }
     });

+ 149 - 83
lib/pages/order_management_page/order_detail_page.dart

@@ -1,12 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-
+import '../../util/api.dart';
+import '../../util/models.dart';
+import '../../util/util.dart';
+import '../../showAlert.dart';
 class OrderDetailPage extends StatefulWidget {
-  final int orderId;
+  final String orderNo;
 
   OrderDetailPage({
     Key key,
-    @required this.orderId
+    @required this.orderNo
   }): super(key: key);
 
   _OrderDetailPageState createState() => _OrderDetailPageState();
@@ -14,31 +17,19 @@ class OrderDetailPage extends StatefulWidget {
 
 class _OrderDetailPageState extends State < OrderDetailPage > {
 
-  final Map < Object,
-  String > sendInfo = {
-    "icon": 'lib/images/icon_send.png',
-    "title": "发件信息",
-    "phone": "010-8788 6890",
-    "code": "345678",
-    "name": "朝阳门大阳汽贸",
-    "address": "北京市朝阳区",
-    "addressDetail": "朝阳门外大街28号"
-  };
-
-  final Map < Object,
-  String > getInfo = {
-    "icon": 'lib/images/icon_shoujian.png',
-    "title": "收件信息",
-    "name": "香河汽修厂",
-    "phone": "010-6734 3426",
-    "address": "河北省廊坊市",
-    "addressDetail": "香河县东大街29号院18栋3单元206"
-  };
+  OrderDetailData orderDetailObj;
 
   @override
   void initState() {
     super.initState();
-    //print(sendInfo.title);
+    getOrderDetail(widget.orderNo).then((resp){
+      if(isNotError(context, resp)){
+       OrderDetailObj tempObj = OrderDetailObj.fromJson(resp.data);
+       setState(() {
+         orderDetailObj =tempObj.data;
+       });
+      }
+    });
   }
   @override
   Widget build(BuildContext context) {
@@ -51,49 +42,51 @@ class _OrderDetailPageState extends State < OrderDetailPage > {
       body: Container(
         padding: EdgeInsets.fromLTRB(0, ScreenUtil.getInstance().setHeight(20), 0, ScreenUtil.getInstance().setHeight(20)),
         color: Color.fromRGBO(246, 246, 254, 1),
-        child: ListView(
+        child:orderDetailObj==null?Center(
+          child:_getMoreWidget(),
+        ): ListView(
           children: < Widget > [
-            _sendInfo(sendInfo),
-            _getInfo(getInfo),
-            ItemInfoWidget(),
-            submitBtn()
+            _sendInfo(),
+            _getInfo(),
+            ItemInfoWidget(obj:orderDetailObj),
           ],
         )
       ),
+        
       //resizeToAvoidBottomPadding: false //键盘弹出,页面不跟随向上滑动,防止出现溢出错误
     );
   }
 
-  Widget _sendInfo(Map str) {
+  Widget _sendInfo() {
     return Container(
       color: Colors.white,
       margin: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
       child: Column(
         children: < Widget > [
-          titleWidget(str['icon'], str['title']),
+          titleWidget('lib/images/icon_send.png', '发件信息'),
           underLine(),
-          contentWiget('电话', str['phone']),
-          contentWiget('企业编码', str['code']),
-          contentWiget('企业名称', str['name']),
-          contentWiget('城市/区域', str['address']),
-          lastContentWiget('详细地址', str['addressDetail'])
+          contentWiget('电话', orderDetailObj.senderPhone),
+          contentWiget('企业编码', orderDetailObj.sendCompanyCode),
+          contentWiget('企业名称', orderDetailObj.sendCompanyName),
+          contentWiget('城市/区域', '${orderDetailObj.sendCompanyProvinceName}' '${orderDetailObj.sendCompanyCityName}' '${orderDetailObj.sendCompanyAreaName}'),
+          lastContentWiget('详细地址', orderDetailObj.sendCompanyAddress)
         ],
       )
     );
   }
 
-  Widget _getInfo(Map str) {
+  Widget _getInfo() {
     return Container(
       color: Colors.white,
       margin: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
       child: Column(
         children: < Widget > [
-          titleWidget(str['icon'], str['title']),
+          titleWidget('lib/images/icon_shoujian.png', '收件信息'),
           underLine(),
-          contentWiget('企业名称', str['name']),
-          contentWiget('电话', str['phone']),
-          contentWiget('城市/区域', str['address']),
-          lastContentWiget('详细地址', str['addressDetail'])
+          contentWiget('企业名称', orderDetailObj.receiptCompanyName),
+          contentWiget('电话', orderDetailObj.receiptCompanyPhone),
+          contentWiget('城市/区域', '${orderDetailObj.receiptCompanyProvinceName}' '${orderDetailObj.receiptCompanyCityName}' '${orderDetailObj.receiptCompanyAreaName}'),
+          lastContentWiget('详细地址', orderDetailObj.sendCompanyAddress)
         ],
       )
     );
@@ -102,9 +95,10 @@ class _OrderDetailPageState extends State < OrderDetailPage > {
 
 
 class ItemInfoWidget extends StatefulWidget {
-
+  final OrderDetailData obj;
   ItemInfoWidget({
-    Key key
+    Key key,
+    @required this.obj
   }): super(key: key);
 
   _ItemInfoWidgetState createState() => _ItemInfoWidgetState();
@@ -112,18 +106,20 @@ class ItemInfoWidget extends StatefulWidget {
 
 class _ItemInfoWidgetState extends State < ItemInfoWidget > {
 
-  Map < String,
-  String > _itemInfo = {
-    "icon": "lib/images/icon_huowu.png",
-    "title": "货物信息",
-    "itemName": "汽车轮胎",
-    "itemNo": "4",
-    "expressPrice": "15",
-    "collectionPrice": "15800",
-    "supportPrice": "5000",
-    "weight": "600",
-    "itemDesc": "轮胎请核对数量轮胎请"
-  };
+  double afterTransportFee=0.0;//运费
+  int afterGoodsNumber=0;//数量
+  double afterCollectingFee=0.0;//代收
+  bool submitStatus = true;
+  @override
+  void initState() {
+    super.initState();
+    setState(() {
+       afterTransportFee = widget.obj.goodsFreight/100;
+       afterGoodsNumber =widget.obj.goodsQuantity;
+       afterCollectingFee =widget.obj.goodsAgencyFund/100;
+    });
+   
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -133,22 +129,23 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: < Widget > [
-            titleWidget(_itemInfo['icon'], "货物信息"),
+            titleWidget('lib/images/icon_huowu.png', "货物信息"),
             underLine(),
-            contentWiget("货物名称", _itemInfo["itemName"]),
-            _inputWidget("数量", _itemInfo["itemNo"]),
-            _inputWidget("运费", _itemInfo["expressPrice"]),
-            _inputWidget("代收", _itemInfo["collectionPrice"]),
-            contentWiget("保价", _itemInfo["supportPrice"]),
-            contentWiget("重量", _itemInfo["weight"]),
-            _descWidget(_itemInfo['itemDesc'])
+            contentWiget("货物名称",widget.obj.goods),
+            _inputWidget("数量", widget.obj.goodsQuantity),
+            _inputWidget("运费", widget.obj.goodsFreight/100),
+            _inputWidget("代收", widget.obj.goodsAgencyFund/100),
+            contentWiget("保价", widget.obj.goodsPriceProtection.toString()),
+            contentWiget("重量", widget.obj.goodsWeight.toStringAsFixed(1)),
+            _descWidget(widget.obj.memo),
+            submitBtn(widget.obj.orderNo)
           ],
         ),
       )
     );
   }
 
-  Widget _inputWidget(String key, String value) {
+  Widget _inputWidget(String key, num value) {
     return Padding(
       padding: EdgeInsets.only(left: ScreenUtil.getInstance().setWidth(30)),
       child: Column(
@@ -178,10 +175,19 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
                                 ),
                                 decoration: InputDecoration(
                                   border: InputBorder.none,
-                                  hintText: value,
+                                  hintText: value.toString(),
                                   hintStyle: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(136, 136, 136, 1)),
                                   contentPadding: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(20), 0, 0, 0),
                                 ),
+                                onChanged: (value){
+                                  if(key=='数量'){
+                                    afterGoodsNumber =int.parse(value);
+                                  }else if(key=='运费'){
+                                    afterTransportFee =double.parse(value);
+                                  }else if(key=='代收'){
+                                    afterCollectingFee =double.parse(value);
+                                  }
+                                },
                               ),
                             )
                           ),
@@ -209,6 +215,62 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
       child: Text(str, maxLines: 100, style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(74, 74, 74, 1)), ),
     );
   }
+
+  Widget submitBtn(String orderNo) {
+  return GestureDetector(
+    child: Container(
+      margin: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(50), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(40)),
+      height: ScreenUtil.getInstance().setHeight(88),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.all(Radius.circular(4)),
+        color: Color.fromRGBO(37, 102, 242, 1),
+      ),
+      child: Center(
+       child:Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: <Widget>[
+              Offstage(
+                offstage: submitStatus,
+                child: SizedBox(
+                  width: ScreenUtil.getInstance().setWidth(45),
+                  height: ScreenUtil.getInstance().setHeight(45),
+                  child: Image.asset('lib/images/loading.gif'),
+                ),
+              ),
+              Text('提交', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(36), color: Colors.white)),
+          ],
+        )
+      ),
+    ),
+    onTap: () {
+      if(!submitStatus) return;
+      setState(() {
+        submitStatus = false;
+      });
+      updataOrder(orderNo,afterTransportFee,afterCollectingFee,afterGoodsNumber).then((resp){
+        if(isNotError(context, resp)){
+          showDialog < Null > (
+          context: context, //BuildContext对象
+          barrierDismissible: false,
+          builder: (BuildContext context) {
+            return MyAlertDialog( //调用对话框
+              text: '订单修改成功!', childCallback: (val) {
+                if(val){
+                  Navigator.pop(context);
+                }
+              },
+            );
+          });
+        }else{
+          setState(() {
+            submitStatus = true;
+          });
+        }
+      });
+    },
+  );
+}
+  
 }
 
 Widget titleWidget(String iconUrl, String str) {
@@ -292,22 +354,26 @@ Widget lastContentWiget(String key, String value) {
   );
 }
 
+Widget _getMoreWidget() {
+    return Center(
+      child: Padding(
+        padding: EdgeInsets.all(10.0),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: < Widget > [
+            Text(
+              '加载中...',
+              style: TextStyle(fontSize: 16.0),
+            ),
+            Container(
+              width: ScreenUtil.getInstance().setWidth(50),
+              height: ScreenUtil.getInstance().setHeight(50),
+              child: CircularProgressIndicator()
+            )
 
-Widget submitBtn() {
-  return GestureDetector(
-    child: Container(
-      margin: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(50), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(40)),
-      height: ScreenUtil.getInstance().setHeight(88),
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.all(Radius.circular(4)),
-        color: Color.fromRGBO(37, 102, 242, 1),
-      ),
-      child: Center(
-        child: Text("提交", style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(32), color: Colors.white), ),
+          ],
+        ),
       ),
-    ),
-    onTap: () {
-      print('提交');
-    },
-  );
-}
+    );
+  }

+ 1 - 1
lib/pages/send_express_page/order_detail_page.dart

@@ -232,7 +232,7 @@ class _OrderDetailState extends State < OrderDetail > {
                               if (val) {
                                 print(val);
                                 Navigator.push(context, MaterialPageRoute(builder: (context) {
-                                  return OrderDetailPage(orderId: 123456, );
+                                  return OrderDetailPage(orderNo: '123456', );
                                 }));
                               } else {
                                 return;

+ 7 - 1
lib/util/api.dart

@@ -1,6 +1,6 @@
 import 'request.dart';
 
-const int limit = 5;
+const int limit = 10;
 //登录接口
 Future login(phone, passwrod) async {
   var response = await Http().post('app/uzer/logistics/phone_login', data: {
@@ -148,4 +148,10 @@ Future orderReception(orderNo){
 Future fromStatusGetOrderList(int orderStatus,int page,[String orderNo='']){
   var response =Http().post('app/order/logistics_order_list_pages',data: {'orderNo':orderNo,'orderStatus':orderStatus,'page':page,'limit':limit});
   return response;
+}
+
+//改单接口
+Future updataOrder(String orderNo,double afterTransportFee,double afterCollectingFee,int afterGoodsNumber){
+  var response =Http().post('app/order/update_order',data: {'orderNo':orderNo,'afterTransportFee':afterTransportFee*100,'afterCollectingFee':afterCollectingFee*100,'afterGoodsNumber':afterGoodsNumber});
+  return response;
 }

+ 28 - 0
lib/util/models.dart

@@ -493,6 +493,7 @@ class OrderDetailData {
   String receiptCompanyCityCode; //收件市码
   String receiptCompanyCityName; //收件市名
   String receiptCompanyName; //收件公司名称
+  String receiptCompanyPhone;//收件公司电话
   String receiptCompanyProvinceCode; //收件省码
   String receiptCompanyProvinceName; //收件省名
   String sendCompanyAddress; //发件详细地址
@@ -503,6 +504,7 @@ class OrderDetailData {
   String sendCompanyCityName; //发件市名
   int sendCompanyId; //发件公司id
   String sendCompanyName; //发件公司名称
+  String sendCompanyCode;//发件公司编码
   String sendCompanyProvinceCode; //发件公司市码
   String sendCompanyProvinceName; //发件公司市名
   String senderIdCard; //发件人身份证号
@@ -527,6 +529,7 @@ class OrderDetailData {
     this.receiptCompanyAddress,
     this.receiptCompanyAreaCode,
     this.receiptCompanyAreaName,
+    this.receiptCompanyPhone,
     this.receiptCompanyBankCard,
     this.receiptCompanyCityCode,
     this.receiptCompanyCityName,
@@ -541,6 +544,7 @@ class OrderDetailData {
     this.sendCompanyCityName,
     this.sendCompanyId,
     this.sendCompanyName,
+    this.sendCompanyCode,
     this.sendCompanyProvinceCode,
     this.sendCompanyProvinceName,
     this.senderIdCard,
@@ -571,6 +575,7 @@ class OrderDetailData {
       receiptCompanyCityCode: json['receiptCompanyCityCode'],
       receiptCompanyCityName: json['receiptCompanyCityName'],
       receiptCompanyName: json['receiptCompanyName'],
+      receiptCompanyPhone:json['receiptCompanyPhone'],
       receiptCompanyProvinceCode: json['receiptCompanyProvinceCode'],
       receiptCompanyProvinceName: json['receiptCompanyProvinceName'],
       sendCompanyAddress: json['sendCompanyAddress'],
@@ -581,6 +586,7 @@ class OrderDetailData {
       sendCompanyCityName: json['sendCompanyCityName '],
       sendCompanyId: json['sendCompanyId'],
       sendCompanyName: json['sendCompanyName'],
+      sendCompanyCode:json['sendCompanyCode'],
       sendCompanyProvinceCode: json['sendCompanyProvinceCode'],
       sendCompanyProvinceName: json['sendCompanyProvinceName'],
       senderIdCard: json['senderIdCard'],
@@ -590,6 +596,7 @@ class OrderDetailData {
   }
 }
 
+//接单对象
 class OrderReception {
   bool success;
   int code;
@@ -697,4 +704,25 @@ class FromStatusGetOrderList {
       sendCompanyName:json['sendCompanyName'],
     );
   }
+}
+
+//提交改单、作废、寄件、拒收、签收后返回对象
+class OrderStatusReturnObj{
+  bool success;
+  int code;
+  String msg;
+
+  OrderStatusReturnObj({
+    this.success,
+    this.code,
+    this.msg
+  });
+
+  factory OrderStatusReturnObj.fromJson(Map<String,dynamic> json){
+    return OrderStatusReturnObj(
+      success:json['success'],
+      code:json['code'],
+      msg:json['msg'],
+    );
+  }
 }