工行代扣下载接口修改

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/IcbcWithholdController.java

@@ -180,9 +180,9 @@ public class IcbcWithholdController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = " 聚富通代扣信息回盘文件获取",   notes = " 聚富通代扣信息回盘文件获取")
 	@GetMapping(value = "/downLoadicbcFile")
-	public ResponseModel<String> downLoadicbcFile( Long sequenceNbr,String batchNo ) throws Exception {
-
-		return ResponseHelper.buildResponse(icbcWithholdServiceImpl.downLoadicbcFile(batchNo,sequenceNbr));
+	public ResponseModel<String> downLoadicbcFile( Long sequenceNbr,String batchNo,HttpServletResponse response ) throws Exception {
+		icbcWithholdServiceImpl.downLoadicbcFile(batchNo,sequenceNbr,response);
+		return ResponseHelper.buildResponse(null);
 	}
 	/**
 	 * 列表全部数据查询

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/IcbcWithholdServiceImpl.java

@@ -64,9 +64,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import static com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils.fileToMultipartFile;
-import static com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils.fileToMultipartFileZip;
-import static com.yeejoin.amos.boot.module.hygf.api.util.FileUtils.addFileToZip;
-import static com.yeejoin.amos.boot.module.hygf.api.util.FileUtils.cleanup;
+import static com.yeejoin.amos.boot.module.hygf.api.util.FileUtils.*;
 
 /**
  *  聚富通代扣信息表服务实现类
@@ -324,10 +322,10 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
         }
     }
 
-   public String downLoadicbcFile(String batchNo,Long sequenceNbr) throws Exception {
+   public void downLoadicbcFile(String batchNo,Long sequenceNbr,HttpServletResponse response) throws Exception {
         IcbcWithhold model = this.getBaseMapper().selectById(sequenceNbr);
         if (StringUtils.isNotEmpty(model.getReceiptFile())){
-            return model.getReceiptFile();
+            this.downloadAndSaveZipFile(model.getReceiptFile(),batchNo,"回盘文件",response);
         }
 
        String path = new ClassPathResource(file+"secretKey/login-gxjrid_rsa").getPath();
@@ -354,6 +352,7 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
                 model.setReceiptFile(url);
             }
             this.saveOrUpdate(model);
+            this.downloadAndSaveZipFile(model.getReceiptFile(),batchNo,"回盘文件",response);
         }
     } catch ( Exception e) {
             logger.error("平台上传文件失败");
@@ -361,7 +360,7 @@ public class IcbcWithholdServiceImpl extends BaseService<IcbcWithholdDto,IcbcWit
     } finally {
         cleanup(dirPath);
     }
-        return model.getReceiptFile();
+
     }