Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2b into release-201809-suntg

src/main/java/com/uas/platform/b2b/ps/InquiryUtils.java

@@ -39,7 +39,7 @@ public class InquiryUtils {
      * @throws Exception
      */
     public static PublicInquiryItemInfo save(PublicInquiryItemInfo item) throws Exception {
-        String res = HttpUtil.doPost(url + "/inquiry/sale/item/save",  JSONObject.toJSONString(item));
+        String res = HttpUtil.doPost(url + "/inquiry/sale/item/saveQuote",  JSONObject.toJSONString(item));
         if (null != res) {
             Object obj = JSON.parse(res);
             return JSON.parseObject(obj.toString(), PublicInquiryItemInfo.class);

src/main/java/com/uas/platform/b2b/service/impl/EnquiryServiceImpl.java

@@ -1,24 +1,23 @@
  package com.uas.platform.b2b.service.impl;
 
  import com.uas.platform.b2b.model.*;
- import com.uas.platform.b2b.ps.InquiryUtils;
- import com.uas.platform.b2b.service.AttachService;
- import com.uas.platform.b2b.service.EnquiryService;
- import com.uas.platform.b2b.support.SPageUtils;
- import com.uas.platform.b2b.support.SystemSession;
- import com.uas.platform.core.exception.IllegalOperatorException;
- import com.uas.platform.core.exception.NotFoundException;
- import com.uas.platform.core.model.PageInfo;
- import com.uas.platform.core.model.Status;
- import com.uas.search.b2b.model.SPage;
- import com.uas.sso.support.Page;
- import org.springframework.beans.factory.annotation.Autowired;
- import org.springframework.stereotype.Service;
- import org.springframework.ui.ModelMap;
+import com.uas.platform.b2b.ps.InquiryUtils;
+import com.uas.platform.b2b.service.AttachService;
+import com.uas.platform.b2b.service.EnquiryService;
+import com.uas.platform.b2b.support.SPageUtils;
+import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.exception.NotFoundException;
+import com.uas.platform.core.model.PageInfo;
+import com.uas.platform.core.model.Status;
+import com.uas.search.b2b.model.SPage;
+import com.uas.sso.support.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
- import java.util.HashSet;
- import java.util.List;
- import java.util.Set;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
  /**
  * 公共询价操作方法实现
@@ -116,12 +115,10 @@ public class EnquiryServiceImpl implements EnquiryService {
          }
          inquiryItem.setVendUU(SystemSession.getUser().getEnterprise().getUu());
          inquiryItem.setVendUserUU(SystemSession.getUser().getUserUU());
+         inquiryItem.setSourceId(inquiryItem.getId());
+         inquiryItem.setId(null);
          inquiryItem = InquiryUtils.save(inquiryItem);
-         // 这边的id可能是询价的id,但是不会赋值sourceID,所以如果sourceID有值，应该是已经保存过了
-         if (null != inquiryItem.getSourceId()) {
-            return new ModelMap("success", "报价成功");
-         } else {
-             throw new IllegalOperatorException("报价失败");
-         }
+         return new ModelMap("success", "报价成功");
+
      }
  }