fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/OssService.java

@@ -25,7 +25,7 @@ public interface OssService {
 
     String uploadWithPath(OssRequest base,String path) throws Exception;
 
-    String uploadWithUrl(OssRequest base,String urlString) throws Exception;
+    String uploadWithUrl(OssRequest base,String urlString);
 
     String uploadInputStream(InputStream inputStream,Integer imageStatus) throws Exception;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -226,6 +226,9 @@ public class OssServiceImpl implements OssService {
             case 10:
                 RandomFilename = "file" + "/" +(sdf.format(new Date())) + "/" + now + ".zip";
                 break;
+            case 11:
+                RandomFilename = "file/nuonuo" + "/" +(sdf.format(new Date())) + "/" + now + ".pdf";
+                break;
         }
 
         return RandomFilename;
@@ -287,7 +290,7 @@ public class OssServiceImpl implements OssService {
     }
 
     @Override
-    public String uploadWithUrl(OssRequest base, String urlString) throws Exception {
+    public String uploadWithUrl(OssRequest base, String urlString){
         String path = null;
         InputStream inputStream = null;
         try {
@@ -295,7 +298,7 @@ public class OssServiceImpl implements OssService {
             URLConnection con = url.openConnection();
             //获取上传文件输入流
             inputStream =con.getInputStream();
-            path = uploadInputStream(inputStream,10);
+            path = uploadInputStream(inputStream,11);
 
             // 关闭OSSClient。
             //ossClient.shutdown();
@@ -303,8 +306,12 @@ public class OssServiceImpl implements OssService {
         } catch (Exception e) {
 
         }finally {
-            if (null != inputStream) {
-                inputStream.close();
+            try {
+                if (null != inputStream) {
+                    inputStream.close();
+                }
+            }catch (IOException e){
+
             }
             return path;
         }
@@ -329,7 +336,12 @@ public class OssServiceImpl implements OssService {
         try {
             OssRequest ossRequest = new OssRequest();
             ossRequest.setImageStatus(imageStatus);
-            String fileName = generateRandomFilename(ossRequest) + ".jpg";
+            String fileName = null;
+            if(imageStatus<10){
+                fileName = generateRandomFilename(ossRequest) + ".jpg";
+            }else{
+                fileName = generateRandomFilename(ossRequest);
+            }
 
             //调用oss方法实现上传
             //第一个参数  Bucket名称

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -11,6 +11,8 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ToolsUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
+import com.zhongzheng.modules.alioss.bo.OssRequest;
+import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.impl.UserPeriodServiceImpl;
 import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
@@ -57,6 +59,8 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
     private String UpdateInvoice_PATH;
     @Autowired
     private ITopOldOrderService iTopOldOrderService;
+    @Autowired
+    private OssService ossService;
 
     @Override
     public TopNuoMplatformLogVo queryById(Long id){
@@ -229,6 +233,8 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                         }
                         TopNuoMplatformLog mplatformLog = getOne(new LambdaQueryWrapper<TopNuoMplatformLog>().eq(TopNuoMplatformLog::getInvoiceSerialNum, serialNo));
                         if(mplatformLog.getFromPlat()==1){
+                            String ossPath = ossService.uploadWithUrl(new OssRequest(),pdfUrl);
+                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getOssPdfUrl, ossPath);
                             this.update(null, objectLambdaUpdateWrapper);
                             iTopOldOrderService.orderInvoice(orderNo);
                         }