Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -75,8 +75,36 @@ public interface InquiryApi {
      * @return
      */
     @GetMapping("/buyer/list")
-    Page<PurcInquiryItemInfo> getInquiryList(@RequestParam("enUU") Long enUU, @RequestParam("overdue") Integer overdue,
+    IPage<PurcInquiryItemInfo> getInquiryList(@RequestParam("enUU") Long enUU, @RequestParam("overdue") Integer overdue,
                                              @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                             @RequestParam(value = "state", defaultValue = "todo") String state);
+                                             @RequestParam("state") String state);
 
+    /*@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);
+    */
+
+    /**
+     * 采纳
+     * @param id
+     * @param status    是否采纳：1是 0否
+     * @param enuu      企业uu
+     * @param useruu    用户uu
+     */
+    @PostMapping("/buyer/adopt")
+    void adoptQuote(@RequestParam("id") Long id, @RequestParam("status") Short status,
+                    @RequestParam("enuu") Long enuu, @RequestParam("useruu") Long useruu);
+
+    /**
+     *
+     * @param id        报价明细id
+     * @param status    是否采纳：1是 0否
+     * @param enuu      企业uu
+     * @param useruu    用户uu
+     * @param refusereason  拒绝理由
+     */
+    @PostMapping("/buyer/refuse")
+    void refuseQuote(@RequestParam("id") Long id, @RequestParam("status") Short status, @RequestParam("enuu") Long enuu,
+                     @RequestParam("useruu") Long useruu, @RequestParam("refusereason") String refusereason);
 }

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

@@ -1,8 +1,7 @@
 package com.usoftchina.inquiry.test;
 
 import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.po.IPage;
-import com.usoftchina.inquiry.po.PurcInquiryItemInfo;
+import com.usoftchina.inquiry.po.*;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -10,11 +9,14 @@ 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;
 
 /**
+ * 询报价接口测试
  * @Author chenwei
  * @Date 2019/01/04
  */
@@ -26,10 +28,57 @@ public class InquiryApiTest {
     @Autowired
     private InquiryApi inquiryApi;
 
+    private static final Long userUU = 1000002503L;
+    private static final Long enUU = 10041559L;
+    private static final int pageNum = 1;
+    private static final int pageSize = 5;
+
+
     @Test
     public void testA_getInquiry() throws InvalidSearchFilterException {
-        IPage<PurcInquiryItemInfo> result = inquiryApi.getInquiry(1, 10, "1", 1);
+        IPage<PurcInquiryItemInfo> result = inquiryApi.getInquiry(pageNum, pageSize, "1", 1);
         System.out.println(JsonUtils.toJsonString(result));
     }
 
+    @Test
+    public void testB_findEnRemind(){
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, pageNum, pageSize, 1);
+        System.out.println(JsonUtils.toJsonString(inquiryEnRemindIPage));
+    }
+
+    @Test
+    public void testC_findByUserInfo(){
+        IPage<InquiryRemind> inquiryRemindIPage = inquiryApi.findByUserInfo(userUU, enUU, pageNum, pageSize, 1, "1");
+        System.out.println(JsonUtils.toJsonString(inquiryRemindIPage));
+    }
+
+    @Test
+    public void testD_saveQuote(){
+        PublicInquiryItem publicInquiryItem = new PublicInquiryItem();
+        ModelMap modelMap = inquiryApi.saveQuote(publicInquiryItem);
+        System.out.println(JsonUtils.toJsonString(modelMap));
+    }
+
+    @Test
+    public void testE_saveQuote(){
+        PurcInquiry purcInquiry = new PurcInquiry();
+        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");
+        System.out.println(JsonUtils.toJsonString(getInquiryList));
+    }
+
+    @Test
+    public void testG_adoptQuote(){
+        inquiryApi.adoptQuote(0L, (short) 1, enUU, userUU);
+    }
+
+    @Test
+    public void testH_refuseQuote(){
+        inquiryApi.refuseQuote(0L, new Short("1"), enUU, userUU, "reason");
+    }
 }

applications/transfers/mall-api/src/test/resources/application.yml

@@ -1,2 +1,4 @@
 inquiry:
-  base-url: https://test-inquiry.uuzcc.cn
+  base-url: https://test-inquiry.uuzcc.cn
+Component:
+  base-url: https://test-mall.uuzcc.cn