1.接口调整。

2.发起询价测试。

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -1,8 +1,7 @@
 package com.usoftchina.saas.sale.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.IPage;
-import com.usoftchina.inquiry.po.InquiryRemind;
+import com.usoftchina.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
@@ -16,8 +15,6 @@ import com.usoftchina.saas.sale.service.SaleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @author: guq
  * @create: 2018-10-22 11:28

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/SaleService.java

@@ -1,8 +1,7 @@
 package com.usoftchina.saas.sale.service;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.IPage;
-import com.usoftchina.inquiry.po.InquiryRemind;
+import com.usoftchina.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
@@ -12,8 +11,6 @@ import com.usoftchina.saas.sale.dto.RemindRspDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.po.SaleList;
 
-import java.util.List;
-
 /**
  * @author: guq
  * @create: 2018-10-22 11:28

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -1,13 +1,11 @@
 package com.usoftchina.saas.sale.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.po.IPage;
-import com.usoftchina.inquiry.po.InquiryEnRemind;
-import com.usoftchina.inquiry.po.InquiryRemind;
+import com.usoftchina.inquiry.po.inquiry.IPage;
+import com.usoftchina.inquiry.po.inquiry.InquiryEnRemind;
+import com.usoftchina.inquiry.po.inquiry.InquiryRemind;
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.base.Result;
@@ -680,7 +678,7 @@ public class SaleServiceImpl implements SaleService{
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         //Long userUU = 1000002503L, enUU = 10041559L;
         IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, remindReqDTO.getPageNumber(),
-                remindReqDTO.getPageSize(), remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
+                remindReqDTO.getPageSize(), remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), /*remindReqDTO.getQuoted(),*/
                 remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
         List<InquiryEnRemind> inquiryEnRemindList = inquiryEnRemindIPage.getContent();
         if (CollectionUtils.isEmpty(inquiryEnRemindList)){

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/InquiryApi.java

@@ -1,6 +1,6 @@
 package com.usoftchina.inquiry.api;
 
-import com.usoftchina.inquiry.po.*;
+import com.usoftchina.inquiry.po.inquiry.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
@@ -36,7 +36,7 @@ public interface InquiryApi {
     IPage<InquiryEnRemind> findEnRemind(@RequestParam("useruu") Long useruu, @RequestParam("enuu") Long enuu,
                                         @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
                                         @RequestParam("enableOffer") Integer enableOffer, @RequestParam("keyword") String keyword,
-                                        @RequestParam("quoted") Integer quoted, @RequestParam("fromDate") Long fromDate,
+                                        /*@RequestParam("quoted") Integer quoted, */@RequestParam("fromDate") Long fromDate,
                                         @RequestParam("endDate") Long endDate);
 
     /**
@@ -86,8 +86,8 @@ public interface InquiryApi {
      */
     @GetMapping("/buyer/list")
     IPage<PurcInquiryItemInfo> getInquiryList(@RequestParam("enUU") Long enUU, @RequestParam("overdue") Integer overdue,
-                                             @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                             @RequestParam("state") String state);
+                                              @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
+                                              @RequestParam("state") String state);
 
     /**
      * 查看已报价列表
@@ -99,8 +99,8 @@ public interface InquiryApi {
      */
     @GetMapping("/buyer/quotations")
     IPage<PurcInquiryItemInfo> findQuotationsByPage(@RequestParam(value = "state", defaultValue = "done") String state,
-                                                   @RequestParam("enUU") Long enUU,
-                                                   @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize);
+                                                    @RequestParam("enUU") Long enUU,
+                                                    @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize);
 
     /**
      * 采纳

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/config/InquiryFeignConfig.java

@@ -1,13 +0,0 @@
-package com.usoftchina.inquiry.config;
-
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author chenwei
- * @Date 2019/01/04
- */
-public class InquiryFeignConfig {
-
-    private String baseUrl;
-
-}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/Attach.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Attach.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/Enterprise.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Enterprise.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/IPage.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/IPage.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.List;
@@ -69,4 +69,7 @@ public class IPage<T> implements Serializable {
         this.last = last;
         this.totalElements = totalElements;
     }
+
+    public IPage() {
+    }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/InquiryEnRemind.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/InquiryEnRemind.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/InquiryRemind.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/InquiryRemind.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/Product.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Product.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.util.Date;
 import java.util.Set;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/ProductMatchResult.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/ProductMatchResult.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PublicInquiry.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiry.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PublicInquiryItem.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiryItem.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import org.springframework.util.CollectionUtils;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PublicInquiryReply.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiryReply.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiry.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiry.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiryInfo.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiryItem.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryItem.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.util.*;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiryItemInfo.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryItemInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.util.*;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurchaseInquiryReply.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurchaseInquiryReply.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/User.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/User.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/InquiryApiTest.java

@@ -1,7 +1,7 @@
 package com.usoftchina.inquiry.test;
 
 import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.po.*;
+import com.usoftchina.inquiry.po.inquiry.*;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -9,11 +9,13 @@ import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.Page;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.ui.ModelMap;
 
 import javax.naming.directory.InvalidSearchFilterException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * 询报价接口测试
@@ -42,7 +44,7 @@ public class InquiryApiTest {
 
     @Test
     public void testB_findEnRemind(){
-        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, pageNum, pageSize, 1, "", 0, null, null);
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, pageNum, pageSize, 0, "", /*0,*/ null, null);
         System.out.println(JsonUtils.toJsonString(inquiryEnRemindIPage));
     }
 
@@ -62,6 +64,40 @@ public class InquiryApiTest {
     @Test
     public void testE_saveInquiry(){
         PurcInquiry purcInquiry = new PurcInquiry();
+        purcInquiry.setEnUU(10050573L);
+        //企业信息
+        Enterprise enterprise = new Enterprise();
+        enterprise.setAdminUU(1000012297L);
+        enterprise.setBusinesscode("SAASTRADE201812121465");
+        enterprise.setEnAddress("江苏省南京市玄武区峡谷之巅");
+        enterprise.setEnName("何炎");
+        enterprise.setEnTel("13978887888");
+        enterprise.setUu(10050573L);
+
+        purcInquiry.setEnterprise(enterprise);
+        purcInquiry.setEnName("何炎");
+        purcInquiry.setRecorderUU(1000012297L);
+        purcInquiry.setDate(new Date());
+        purcInquiry.setRecorder("何炎");
+        purcInquiry.setEndDate(new Date(System.currentTimeMillis() + 3 * 24 * 60 * 60 * 1000));
+        purcInquiry.setSourceapp("sp");
+        purcInquiry.setShip("江苏省南京市玄武区峡谷之巅");
+
+        //询价明细
+        PurcInquiryItem purcInquiryItem = new PurcInquiryItem();
+        purcInquiryItem.setCmpCode("MT8783V");
+        purcInquiryItem.setUserUU(1000012297L);
+        purcInquiryItem.setUserName("何炎");
+        purcInquiryItem.setUserTel("13978887888");
+        purcInquiryItem.setProdCode("CPU0000001");
+        purcInquiryItem.setProdTitle("控制器IC");
+        purcInquiryItem.setSpec("MT8783V/CT,VFBGA641,SMD,无卤");
+        purcInquiryItem.setInbrand("MTK");
+
+        Set<PurcInquiryItem> purcInquiryItemSet = new HashSet<PurcInquiryItem>();
+        purcInquiryItemSet.add(purcInquiryItem);
+        purcInquiry.setInquiryItems(purcInquiryItemSet);
+
         PurcInquiry result = inquiryApi.saveInquiry(purcInquiry);
         System.out.println(JsonUtils.toJsonString(result));
     }