修改

src/main/java/com/steerinfo/dil/controller/BMSController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.config.ImageFileUtils;
 import com.steerinfo.dil.feign.BmsshipFeign;
 import com.steerinfo.dil.feign.BmstrainFeign;
 import com.steerinfo.dil.feign.BmstruckFeign;
@@ -14,8 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartRequest;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,7 +37,8 @@ public class BMSController extends BaseRESTfulController {
     BmstrainFeign bmstrainFeign;
     @Autowired
     BmstruckFeign bmstruckFeign;
-
+    @Autowired
+    private ImageFileUtils imageFileUtils;
     /**
      * 水运结算
      *
@@ -494,9 +498,35 @@ public class BMSController extends BaseRESTfulController {
     }
 
     @PostMapping("addTruckStatement")
-    @ApiOperation(value = "新增汽运详单")
-    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
-        return bmstruckFeign.addTruckStatement(mapList);
+    @ApiOperation(value = "新增汽运账单")
+    RESTfulResult addTruckStatement(@RequestParam("excludeTax") BigDecimal excludeTax,@RequestParam("userId") String userId, @RequestParam("orderList")BigDecimal[] orderList, MultipartRequest request) {
+        String url="";
+        List<MultipartFile> files = new ArrayList<>();
+        //获取图片
+        for(int i=0;i<=1;i++){
+            MultipartFile temp = request.getFile("file"+i);
+            if(temp!=null){
+                files.add(temp);
+            }
+        }
+        if(files.size() < 1){
+            return failed("没有上传图片！");
+        }
+        //上传图片
+        try{
+            for(int i=0;i<files.size();i++){
+                url+=imageFileUtils.updateFile(files.get(i),i)+';';
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed("上传图片失败！");
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("excludeTax",excludeTax);
+        map.put("orderList",orderList);
+        map.put("url",url);
+        map.put("userId",userId);
+        return bmstruckFeign.addTruckStatement(map);
     }
 
     @PostMapping("addTruckDetailsOrder/{orderId}")

src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

@@ -122,11 +122,11 @@ public interface BmstruckFeign {
     /**
      * 生成销售汽运计费账单
      *
-     * @param mapList
+     * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addTruckStatement")
-    RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList);
+    RESTfulResult addTruckStatement(@RequestBody Map<String, Object> map);
 
     /**
      * 展示账单下的详单