diff --git a/app/build.gradle b/app/build.gradle
index d658670..8410c78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,7 +125,7 @@ android {
             }
             def date = new Date().format("MMdd_HH-mm" , TimeZone.getTimeZone("GMT+08"))
             variant.outputs.all {
-                outputFileName = appName+date+"_${variant.productFlavors[0].name}_v${versionName}.apk"
+                outputFileName = appName+date+"_${variant.buildType.name}_v${defaultConfig.versionName}.apk"
             }
         }
     }
diff --git a/app/src/main/java/com/oneclouds/cargo/bean/UserBean.java b/app/src/main/java/com/oneclouds/cargo/bean/UserBean.java
index 4e2564c..092a73e 100644
--- a/app/src/main/java/com/oneclouds/cargo/bean/UserBean.java
+++ b/app/src/main/java/com/oneclouds/cargo/bean/UserBean.java
@@ -74,7 +74,7 @@ public class UserBean {
         private int auditStatus;
         private String distance;
         private int waybillNum;
-        private Object orderNum;
+        private String orderNum;
         private String idCardValidity;
         private String driverValidity;
         private String qualificationValidity;
@@ -255,11 +255,11 @@ public class UserBean {
             this.waybillNum = waybillNum;
         }
 
-        public Object getOrderNum() {
+        public String getOrderNum() {
             return orderNum;
         }
 
-        public void setOrderNum(Object orderNum) {
+        public void setOrderNum(String orderNum) {
             this.orderNum = orderNum;
         }
 
diff --git a/app/src/main/java/com/oneclouds/cargo/request/PublicRequest.java b/app/src/main/java/com/oneclouds/cargo/request/PublicRequest.java
index 4110852..59a22b4 100644
--- a/app/src/main/java/com/oneclouds/cargo/request/PublicRequest.java
+++ b/app/src/main/java/com/oneclouds/cargo/request/PublicRequest.java
@@ -1,5 +1,7 @@
 package com.oneclouds.cargo.request;
 
+import static com.oneclouds.cargo.request.manager.UrlManager.BASE_URL;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Handler;
@@ -124,6 +126,18 @@ public class PublicRequest {
         Request re = OkHttpUtil.posts(new OkDate(UrlManager.getUserInfo(), "post", MapUtil.mapJson(map)),getToken(con),con);
         RequestTest.test(1,USER_DATA,re,con,hd);
     }
+
+
+    /**
+     * 获取钱包信息
+     */
+    public void getWalletInfo(){
+        Map<String,Object> map=new HashMap();
+        Request re = OkHttpUtil.posts(new OkDate(BASE_URL+"shipperWeb/account/getUserInfo", "post", MapUtil.mapJson(map)),getToken(con),con);
+        RequestTest.test(1,USER_DATA,re,con,hd);
+    }
+
+
     //银行卡列表
     public void getBankCardList(){
         Map<String,Object> map=new HashMap();
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/wallet/WalletFragment.java b/app/src/main/java/com/oneclouds/cargo/ui/wallet/WalletFragment.java
index db3084d..2e4717b 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/wallet/WalletFragment.java
+++ b/app/src/main/java/com/oneclouds/cargo/ui/wallet/WalletFragment.java
@@ -45,7 +45,7 @@ public class WalletFragment extends BaseFragment {
     private BankCardListBean bcb;
     private PublicRequest pr;
     private ContractsBean cb;
-    private TextView account;
+    private TextView account,waybillNum,freight;
     private Gson gson=new Gson();
     private boolean iscon=false;
     public static UserBean userBean;
@@ -143,7 +143,8 @@ public class WalletFragment extends BaseFragment {
             Log.e("下拉刷新","pps");
             pr.getBankCardList();
             pr.getContracts();
-            pr.getUserInfo();
+//            pr.getUserInfo();
+            pr.getWalletInfo();
         });
         refreshLayout.autoRefresh();
     }
@@ -164,6 +165,8 @@ public class WalletFragment extends BaseFragment {
         bank_number=root.findViewById(R.id.bank_number);
         bank2_number=root.findViewById(R.id.bank2_number);
         tixian=root.findViewById(R.id.tixian);
+        freight=root.findViewById(R.id.freight);
+        waybillNum=root.findViewById(R.id.waybillNum);
         explain=root.findViewById(R.id.explain);
         orderAll=root.findViewById(R.id.orderAll);
         bank_remove=root.findViewById(R.id.bank_remove);
@@ -213,6 +216,8 @@ public class WalletFragment extends BaseFragment {
     public void initUser(){
         if(userBean.getData()!=null){
             account.setText(StringUtil.isNull(userBean.getData().getAccount(),"0"));
+            waybillNum.setText(StringUtil.isNull(userBean.getData().getWaybillNum()+"","0"));;
+            freight.setText(StringUtil.isNull(userBean.getData().getFreight(),"0"));
         }
     }