Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	WeiChat/version.properties
#	app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

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

@@ -341,7 +341,7 @@ public class CustomerInquiryDetailActivity extends BaseMVPActivity<WorkPlatPrese
             params.put("en_uu", 10041559);
 //        params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
             params.put("user_tel", "15671616315");
-            params.put("id", mId);
+            params.put("itemId", mId);
 
             HttpRequest.getInstance().sendRequest("http://192.168.253.102:8090/platform-b2b/"
                     , new HttpParams.Builder()

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

@@ -288,24 +288,30 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.CUSTOMER_INQUIRY_LIST);
                 b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
 
+                long date = contentObject.getLongValue("date");
+                if (date != 0) {
+                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
+                }
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");
+                JSONObject productObject = contentObject.getJSONObject("product");
+
+                if (productObject != null) {
+                    b2BBusinessListBean.setProductName(JSONUtil.getText(productObject, "title"));
+                    b2BBusinessListBean.setProductModel(JSONUtil.getText(productObject, "code"));
+                    b2BBusinessListBean.setProductSpecification(JSONUtil.getText(productObject, "spec"));
+                    b2BBusinessListBean.setProductBrand(JSONUtil.getText(productObject, "brand"));
+                }
                 if (inquiryObject != null) {
                     JSONObject enterpriseObject = inquiryObject.getJSONObject("enterprise");
                     if (enterpriseObject != null) {
                         b2BBusinessListBean.setCompanyName(JSONUtil.getText(enterpriseObject, "enName"));
                     }
-                    b2BBusinessListBean.setMaterialNum(JSONUtil.getText(inquiryObject, "code"));
-                    b2BBusinessListBean.setBillNum(JSONUtil.getText(inquiryObject, "id"));
 
                     long endDate = inquiryObject.getLongValue("endDate");
                     if (endDate != 0) {
                         b2BBusinessListBean.setExpiryDate(DateFormatUtil.long2Str(endDate, DateFormatUtil.YMD));
                     }
                 }
-                long date = contentObject.getLongValue("date");
-                if (date != 0) {
-                    b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
-                }
                 String invalid = JSONUtil.getText(contentObject, "invalid");
                 if ("1".equals(invalid)) {
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_INVALID);
@@ -314,26 +320,14 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                     if ("1".equals(overdue)) {
                         b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_END);
                     } else {
-                        String agreed = JSONUtil.getText(contentObject, "agreed");
-                        if ("1".equals(agreed)) {
-                            b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_AGREED);
-                        } else if ("0".equals(agreed)) {
-                            b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_REFUSED);
-                        } else {
-                            String status = JSONUtil.getText(contentObject, "status");
-                            if ("200".equals(status)) {
-                                b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO);
-                            } else if ("201".equals(status)) {
-                                b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_DONE);
-                            }
-                        }
+                        b2BBusinessListBean.setBillState(Constants.FLAG.STATE_CUSTOMER_INQUIRY_TODO);
                     }
-                }
 
-                mB2BBusinessListBeans.add(b2BBusinessListBean);
+                    mB2BBusinessListBeans.add(b2BBusinessListBean);
+                }
             }
+            mB2BBusinessListAdapter.notifyDataSetChanged();
         }
-        mB2BBusinessListAdapter.notifyDataSetChanged();
     }
 
     private void analysisCustomerInquiry(JSONArray contentArray) {