提交分类： 功能发布；

提交内容：  B2B商务
当前版本：  测试版本6.1.1
是否冲突：  否

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 24 18:08:58 CST 2018
-debugName=152
+#Wed Jan 24 19:15:56 CST 2018
+debugName=153
 versionName=613
-debugCode=152
+debugCode=153
 versionCode=152

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

@@ -17,6 +17,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.thread.ThreadPool;
+import com.core.api.wxapi.ApiPlatform;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.net.http.http.OAHttpHelper;
@@ -61,7 +62,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
     @Override
     protected String getBaseUrl() {
 //        return "http://uas.ubtob.com/";
-        return "http://192.168.253.102:8090/platform-b2b/";
+        return new ApiPlatform().getBaseUrl();
     }
 
     @Override

app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessMainActivity.java

@@ -19,6 +19,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
+import com.core.api.wxapi.ApiPlatform;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
@@ -214,7 +215,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                     params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
                     params.put("id", mPublicInquiryBeans.get(position).getId());
 
-                    HttpRequest.getInstance().sendRequest("http://192.168.253.192:8080/",
+                    HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
                             new HttpParams.Builder()
                                     .url("inquiry/sale/quote")
                                     .method(Method.GET)
@@ -277,7 +278,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
     }
 
     private void getListData(int flag) {
-        String host = "http://192.168.253.102:8090/platform-b2b/";
+        String host = new ApiPlatform().getBaseUrl();
         String url = "";
         switch (flag) {
             case OBTAIN_PURCHASE_ORDER_LIST:
@@ -287,7 +288,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 url = "mobile/sale/inquiry/info/search";
                 break;
             case OBTAIN_PUBLIC_INQUIRY_LIST:
-                host = "http://192.168.253.192:8080/";
+                host = "http://218.17.158.219:24000/";
                 url = "inquiry/public/mobile";
                 break;
         }

app_modular/appworks/src/main/java/com/uas/appworks/activity/CustomerInquiryDetailActivity.java

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
+import com.core.api.wxapi.ApiPlatform;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
@@ -186,11 +187,11 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             params.put("id", mId);
             params.put("itemId", mId);
 
-            String host = "http://192.168.253.102:8090/platform-b2b/";
+            String host = new ApiPlatform().getBaseUrl();
             String url = "mobile/sale/inquiry/" + mId + "/info";
             int flag = CUSTOMER_INQUIRY_DETAIL;
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
-                host = "http://192.168.253.192:8080/";
+                host = "http://218.17.158.219:24000/";
                 url = "inquiry/sale/publicInquiry/detail";
                 flag = PUBLIC_INQUIRY_DETAIL;
             }
@@ -375,10 +376,10 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
 
             showLoading(null);
             String url = "mobile/sale/inquiry/items/" + mId + "/reply";
-            String host = "http://192.168.253.102:8090/platform-b2b/";
+            String host = new ApiPlatform().getBaseUrl();
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
                 url = "inquiry/sale/mobile/quote";
-                host = "http://192.168.253.192:8080/";
+                host = "http://218.17.158.219:24000/";
             }
             HttpRequest.getInstance().sendRequest(host
                     , new HttpParams.Builder()
@@ -428,10 +429,10 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             }
 
             String url = "mobile/sale/inquiry/" + mId + "/info";
-            String host = "http://192.168.253.102:8090/platform-b2b/";
+            String host = new ApiPlatform().getBaseUrl();
             if (Constants.FLAG.STATE_PUBLIC_INQUIRY_TODO.equals(mState)) {
                 url = "inquiry/sale/inquiry/detail";
-                host = "http://192.168.253.192:8080/";
+                host = "http://218.17.158.219:24000/";
             }
             HttpRequest.getInstance().sendRequest(host
                     , new HttpParams.Builder()
@@ -462,7 +463,10 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
         } else if (flag == PUBLIC_INQUIRY_DETAIL) {
 
             initEditable(true, View.VISIBLE);
-            initDetailData(result);
+
+            JSONObject resultObject = JSON.parseObject(result);
+            JSONObject inquiryItem = resultObject.getJSONObject("inquiryItem");
+            initDetailData(inquiryItem.toString());
         }
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/PublicInquiryDetailActivity.java

@@ -130,7 +130,7 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
             params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
             params.put("id", mId);
 
-            HttpRequest.getInstance().sendRequest("http://192.168.253.192:8080/",
+            HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
                     new HttpParams.Builder()
                             .url("inquiry/sale/publicInquiry/detail")
                             .flag(PUBLIC_INQUIRY_DETAIL)

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -16,6 +16,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
+import com.core.api.wxapi.ApiPlatform;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
@@ -164,7 +165,7 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                             params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
                             params.put("id", data.get(position).getId());
 
-                            HttpRequest.getInstance().sendRequest("http://192.168.253.192:8080/",
+                            HttpRequest.getInstance().sendRequest("http://218.17.158.219:24000/",
                                     new HttpParams.Builder()
                                             .url("inquiry/sale/quote")
                                             .flag(INQUIRY_SALE_QUOTE)
@@ -260,9 +261,9 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
             params.put("keyword", mKeyWord);
         }
 
-        String host = "http://192.168.253.102:8090/platform-b2b/";
+        String host = new ApiPlatform().getBaseUrl();
         if (mListType == B2BBusinessListBean.PUBLIC_INQUIRY_LIST) {
-            host = "http://192.168.253.192:8080/";
+            host = "http://218.17.158.219:24000/";
         }
         HttpRequest.getInstance().sendRequest(host,
                 new HttpParams.Builder()