Explorar o código

对账单明细返回数据格式修改

chenw %!s(int64=7) %!d(string=hai) anos
pai
achega
9fc6c80a84

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

@@ -77,7 +77,7 @@ public class B2BApCheckController {
      * @param id
      * @return
      */
-    @GetMapping("/{id}/info")
+    @GetMapping("/info/{id}")
     public Result apCheckInfo(@PathVariable("id") Long id){
         return Result.success(apCheckService.apCheckInfo(id));
     }

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

@@ -216,9 +216,13 @@ public class ApCheckServiceImpl implements ApCheckService {
         account.setUserUU(userUU);
         account.setSpaceUU(enUU);
         String url = b2bUrl + "/sale/apCheck/" + id + "/info";
-        PurchaseApCheck result = null;
+        JSONObject response = null;
+        Map<String, Object> result = new HashMap<String, Object>();
         try {
-            result = AccessUtils.getForObject(url, account, PurchaseApCheck.class);
+            response = AccessUtils.getForObject(url, account, JSONObject.class);
+            result.put("items", response.getJSONArray("items"));
+            response.remove("items");
+            result.put("main", response);
         } catch (Exception e){
             throw new BizException(80000, e.getMessage());
         }