qin 1 년 전
부모
커밋
ce26747bf1
1개의 변경된 파일6개의 추가작업 그리고 9개의 파일을 삭제
  1. 6 9
      src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

+ 6 - 9
src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -11,10 +11,7 @@ import com.poteviohealth.cgp.common.facade.time.MethodTime;
 import com.poteviohealth.cgp.common.filter.TokenContext;
 import com.poteviohealth.cgp.common.filter.repeatSubmit.RepeatSubmit;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
-import com.poteviohealth.cgp.statistics.model.indto.DishesOrderWebInDTO;
-import com.poteviohealth.cgp.statistics.model.indto.OrderCostWebInDTO;
-import com.poteviohealth.cgp.statistics.model.indto.OrderServiceWebInDTO;
-import com.poteviohealth.cgp.statistics.model.indto.OrderWebInDTO;
+import com.poteviohealth.cgp.statistics.model.indto.*;
 import com.poteviohealth.cgp.statistics.model.outdto.DishesOrderWebOutDTO;
 import com.poteviohealth.cgp.statistics.model.outdto.OrderCostWebOutDTO;
 import com.poteviohealth.cgp.statistics.model.outdto.OrderExcelDTO;
@@ -194,12 +191,12 @@ public class OrderController extends BaseWebController {
     @RequestMapping(value = "/uploadArrayFile", method = RequestMethod.POST)
     @ApiOperation(value = "阿里云图片上传")
     @MethodTime
-    public VaultsResponse uploadArrayFile(@RequestParam("file") MultipartFile file){
-        log.info(file.getOriginalFilename());
-       /* VaultsResponse<List<PriceUploadDto>> vaultsResponse = ossUtils.uploadArrayFile(list);
-        if(vaultsResponse.validate()){
+    public VaultsResponse<String> uploadArrayFile(@RequestParam("file") MultipartFile file,@RequestParam("orderId") Long orderId){
+        log.info(orderId);
+        VaultsResponse<String> vaultsResponse = ossUtils.uploadArrayFile2(file);
+       /* if(vaultsResponse.validate()){
             return orderService.updateOrderUrl(list);
         }*/
-        return VaultsResponse.success();
+        return vaultsResponse;
     }
 }