询价列表接口调整

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -687,9 +687,11 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         IPage<PurcInquiryItemInfo> purcInquiryItemInfoIPage = null;
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         if (inquiryReqDTO.getQuoted() == 1){
-            purcInquiryItemInfoIPage = inquiryApi.findQuotationsByPage("done", enUU, inquiryReqDTO.getPageNumber(), inquiryReqDTO.getPageSize());
+            purcInquiryItemInfoIPage = inquiryApi.findQuotationsByPage("done", enUU, inquiryReqDTO.getPageNumber(), inquiryReqDTO.getPageSize(),
+                    inquiryReqDTO.getFromDate(), inquiryReqDTO.getKeyword(), inquiryReqDTO.getOverdue(), inquiryReqDTO.getEndDate());
         }else{
-            purcInquiryItemInfoIPage = inquiryApi.getInquiryList(enUU, inquiryReqDTO.getOverdue(), inquiryReqDTO.getPageNumber(), inquiryReqDTO.getPageSize(), "todo");
+            purcInquiryItemInfoIPage = inquiryApi.getInquiryList(enUU, inquiryReqDTO.getOverdue(), inquiryReqDTO.getPageNumber(), inquiryReqDTO.getPageSize(),
+                    "todo", inquiryReqDTO.getFromDate(), inquiryReqDTO.getKeyword(), inquiryReqDTO.getEndDate());
         }
         List<PurcInquiryItemInfo> purcInquiryItemInfoList =  purcInquiryItemInfoIPage.getContent();
         if (CollectionUtils.isEmpty(purcInquiryItemInfoList)){
@@ -774,10 +776,11 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 @Override
                 public void run() {
                     try {
-                        inquiryApi.saveInquiry(purcInquiry);
+                        PurcInquiry result = inquiryApi.saveInquiry(purcInquiry);
+                        LOGGER.info("发起询价,成功,返回数据: {}", JsonUtils.toJsonString(result));
                         latch.countDown();
                     }catch (Exception e){
-                        LOGGER.info("发起询价,失败,传入数据: {}, 失败原因: {}", JsonUtils.toJsonString(purcInquiry), e.getMessage());
+                        LOGGER.info("发起询价,失败,传入数据: {}, 失败原因: {}, 返回结果: {}", JsonUtils.toJsonString(purcInquiry), e.getMessage(), JsonUtils.toJsonString(result));
                         Map<String, String> map = new HashMap<String, String>();
                         map.put("errCode", purcInquiry.getInquiryItems().iterator().next().getProdCode());
                         result.add(map);
@@ -788,7 +791,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
         try {
             latch.await();
-            LOGGER.info("发起询价,处理完成,传入数据: {}", JsonUtils.toJsonString(inquiryAddDTOList));
+            LOGGER.info("发起询价,处理完成.");
             return result;
         } catch (InterruptedException e) {
             e.printStackTrace();

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

@@ -87,7 +87,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("state") String state, @RequestParam("fromDate") Long fromDate,
+                                              @RequestParam("keyword") String keyword, @RequestParam("endDate") Long endDate);
 
     /**
      * 查看已报价列表
@@ -99,7 +100,9 @@ public interface InquiryApi {
      */
     @GetMapping("/buyer/quotations")
     IPage<PurcInquiryItemInfo> findQuotationsByPage(@RequestParam("state") String state, @RequestParam("enUU") Long enUU,
-                                                    @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize);
+                                                    @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
+                                                    @RequestParam("fromDate") Long fromDate, @RequestParam("keyword") String keyword,
+                                                    @RequestParam("overdue") Integer overdue, @RequestParam("endDate") Long endDate);
 
     /**
      * 采纳

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

@@ -122,14 +122,14 @@ public class InquiryApiTest {
 
         //询价明细
         PurcInquiryItem purcInquiryItem = new PurcInquiryItem();
-        purcInquiryItem.setCmpCode("MT8783V");
+        purcInquiryItem.setCmpCode("123123");
         purcInquiryItem.setUserUU(1000012297L);
         purcInquiryItem.setUserName("何炎");
         purcInquiryItem.setUserTel("13978887888");
-        purcInquiryItem.setProdCode("CPU0000001");
-        purcInquiryItem.setProdTitle("控制器IC");
-        purcInquiryItem.setSpec("MT8783V/CT,VFBGA641,SMD,无卤");
-        purcInquiryItem.setInbrand("MTK");
+        purcInquiryItem.setProdCode("PR0006");
+        purcInquiryItem.setProdTitle("1");
+        purcInquiryItem.setSpec("1");
+        purcInquiryItem.setInbrand("YAGEO");
 
         Set<PurcInquiryItem> purcInquiryItemSet = new HashSet<PurcInquiryItem>();
         purcInquiryItemSet.add(purcInquiryItem);
@@ -139,9 +139,17 @@ public class InquiryApiTest {
         System.out.println(JsonUtils.toJsonString(result));
     }
 
+    @Test
+    public void testE_saveInquiry2(){
+        String data = "{\"id\":null,\"enUU\":null,\"enterprise\":{\"uu\":null,\"enName\":\"何炎\",\"enTel\":null,\"enAddress\":null,\"businesscode\":null,\"adminUU\":null},\"enName\":\"何炎\",\"recorderUU\":1000012297,\"code\":null,\"date\":\"2019-01-10 10:38:17\",\"recorder\":\"何炎\",\"endDate\":\"2019-01-11 10:38:17\",\"remark\":null,\"environment\":null,\"inquiryItems\":[{\"id\":null,\"number\":null,\"inquiry\":null,\"userUU\":1000012297,\"userName\":\"何炎\",\"userTel\":\"18702604709\",\"productId\":null,\"product\":null,\"prodCode\":\"PR0006\",\"prodTitle\":\"1\",\"spec\":\"1\",\"cmpCode\":\"123123\",\"inbrand\":\"YAGEO\",\"currency\":null,\"taxrate\":null,\"fromDate\":null,\"replies\":null,\"status\":null,\"agreed\":null,\"overdue\":null,\"source\":null,\"needquantity\":null,\"sourceid\":null,\"date\":null,\"enuu\":null,\"offerAmount\":null,\"endDate\":null,\"remainingTime\":null,\"valid\":null}],\"attachs\":null,\"enteryStatus\":null,\"ship\":null,\"invoice\":null,\"ifTax\":null,\"currency\":null,\"inquirytype\":null,\"sourceapp\":\"sp\",\"erpid\":null,\"erpdate\":null,\"amount\":null,\"spec\":null,\"count\":1,\"quotedAmount\":null,\"replaceQuotedAmount\":null,\"minPriceSum\":null,\"minDeliverySum\":null}";
+        PurcInquiry purcInquiry = JsonUtils.fromJsonString(data, PurcInquiry.class);
+        PurcInquiry result  = inquiryApi.saveInquiry(purcInquiry);
+        System.out.println(JsonUtils.toJsonString(result));
+    }
+
     @Test
     public void testF_getInquiryList(){
-        IPage<PurcInquiryItemInfo> getInquiryList = inquiryApi.getInquiryList(enUU, 1, pageNum, pageSize, "todo");
+        IPage<PurcInquiryItemInfo> getInquiryList = inquiryApi.getInquiryList(enUU, 1, pageNum, pageSize, "todo", null, null, null);
         System.out.println(JsonUtils.toJsonString(getInquiryList));
     }
 

base-servers/account/account-server/src/main/resources/mapper/CompanyMapper.xml

@@ -129,7 +129,7 @@
     </select>
     <select id="getCompanyRspDTOById" resultType="com.usoftchina.saas.account.dto.CompanyRspDTO">
         SELECT
-          ac.id,ac.name,aa.realname admin,aa.mobile adminMobile
+          ac.id,ac.name,aa.realname admin,aa.mobile adminMobile,aa.uu adminUU,ac.uu,ac.tel,ac.address,ac.business_code businessCode
         FROM
           ac_company ac
           INNER JOIN ac_account aa on ac.creator_id = aa.id