应收对账单BUG修改

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

@@ -27,8 +27,8 @@ public class B2BApCheckController {
      * @return
      */
     @GetMapping("/customer")
-    public Result custApcheck(int count, int page, String searchFilter, String sorting){
-        return Result.success(apCheckService.getCustApcheck(count, page, searchFilter, sorting));
+    public Result custApcheck(int count, int page, String searchFilter, String sorting, String keyword){
+        return Result.success(apCheckService.getCustApcheck(count, page, searchFilter, sorting, keyword));
     }
 
     /**

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

@@ -12,7 +12,7 @@ import org.springframework.ui.ModelMap;
  */
 public interface ApCheckService {
 
-    Object getCustApcheck(int count, int page, String searchFilter, String sorting);
+    Object getCustApcheck(int count, int page, String searchFilter, String sorting, String keyword);
 
     Object getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory,
                             String prodTitle, String suuorname, String prodSpec, String currency);

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

@@ -50,7 +50,7 @@ public class ApCheckServiceImpl implements ApCheckService {
 
 
     @Override
-    public Object getCustApcheck(int count, int page, String searchFilter, String sorting) {
+    public Object getCustApcheck(int count, int page, String searchFilter, String sorting, String keyword) {
         Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
         Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         UserAccount account = new UserAccount();
@@ -61,6 +61,9 @@ public class ApCheckServiceImpl implements ApCheckService {
         JSONArray result = new JSONArray();
         try {
             String getUrl = b2bUrl + CUSTAPCHECKURL + "?count=" + count + "&page=" + page + "&searchFilter=" + URLEncoder.encode(searchFilter, "UTF-8");
+            if (!StringUtils.isEmpty(keyword)){
+                getUrl += "&keyword=" + keyword;
+            }
             if (!StringUtils.isEmpty(sorting)) {
                 getUrl += "&sorting=" + URLEncoder.encode(sorting, "utf-8");
             }
@@ -195,11 +198,11 @@ public class ApCheckServiceImpl implements ApCheckService {
             account.setAppId("SAAS");
             account.setUserUU(userUU);
             account.setSpaceUU(enUU);
-            MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
-            map.add("json", JsonUtils.toJsonString(saveOperationData));
             String url = b2bUrl + SAVEAPCHECKURL;
+            //String url = "http://10.1.51.139:8889" + SAVEAPCHECKURL;
+            saveOperationData.setEnUu(enUU);
             try {
-                result = AccessUtils.postForObject(url, account, ModelMap.class, map);
+                result = AccessUtils.postForObject(url, account, ModelMap.class, URLEncoder.encode(JsonUtils.toJsonString(saveOperationData), "UTF-8"));
             } catch (Exception e){
                 throw new BizException(80000, e.getMessage());
             }
@@ -240,6 +243,7 @@ public class ApCheckServiceImpl implements ApCheckService {
         SPage<PurchaseApCheck> result = null;
         try {
             String url = b2bUrl + APCHECKLISTURL + "?count=" + count + "&page=" + page + "&searchFilter=" + URLEncoder.encode(searchFilter, "UTF-8");
+            //String url = "http://10.1.51.139:8889" + APCHECKLISTURL + "?count=" + count + "&page=" + page + "&searchFilter=" + URLEncoder.encode(searchFilter, "UTF-8");
             if (!StringUtils.isEmpty(sorting)) {
                 url += "&sorting=" + URLEncoder.encode(sorting, "utf-8");
             }

applications/sale/sale-server/src/test/java/com/usoftchina/saas/sale/controller/b2bTest.java

@@ -12,6 +12,10 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description TODO
@@ -57,4 +61,19 @@ public class b2bTest {
         System.out.println(JsonUtils.toJsonString(result));
     }
 
+    @Test
+    public void testSet(){
+        Set<Map<String, String>> set = new HashSet<Map<String, String>>();
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("RMB", "1");
+        set.add(map);
+        map = new HashMap<String, String>();
+        map.put("USD", "6.7");
+        set.add(map);
+        map = new HashMap<String, String>();
+        map.put("RMB", "1");
+        set.add(map);
+        System.out.println("set: " + JsonUtils.toJsonString(set));
+        System.out.println("size: " + set.size());
+    }
 }

applications/sale/sale-server/src/test/java/com/usoftchina/saas/sale/service/ApCheckServiceTest.java

@@ -28,7 +28,7 @@ public class ApCheckServiceTest {
         String searchFilter = "{\"fromDate\":\"1514764800000\",\"endDate\":\"1548864000000\"}";
         BaseContextHolder.setUserId(65L);
         BaseContextHolder.setCompanyId(371L);
-        Object result = apCheckService.getCustApcheck(count, page, searchFilter, null);
+        Object result = apCheckService.getCustApcheck(count, page, searchFilter, null, null);
         System.out.println(JsonUtils.toJsonString(result));
     }