he2802 2 years ago
parent
commit
5a3d9319a6

+ 4 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -24,6 +24,8 @@ import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.config.ServerConfig;
 import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.modules.activity.vo.ActivityGoodsPriceVo;
+import com.zhongzheng.modules.alioss.bo.OssRequest;
+import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.bank.service.IExamService;
 import com.zhongzheng.modules.bank.service.IQuestionOtherService;
 import com.zhongzheng.modules.base.bo.ConfigQueryBo;
@@ -153,6 +155,8 @@ public class CommonController extends BaseController {
 
     @Autowired
     private IQuestionOtherService iQuestionOtherService;
+    @Autowired
+    private OssService ossService;
 
     /**
      * 通用下载请求

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

@@ -298,7 +298,7 @@ public class OssServiceImpl implements OssService {
             URLConnection con = url.openConnection();
             //获取上传文件输入流
             inputStream =con.getInputStream();
-            path = uploadInputStream(inputStream,11);
+            path = uploadInputStream(inputStream,base.getImageStatus());
 
             // 关闭OSSClient。
             //ossClient.shutdown();

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

@@ -224,6 +224,10 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getXmlUrl, xmlUrl);
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getStatus, 2);
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getUpdateTime,DateUtils.getNowTime());
+                            OssRequest base = new OssRequest();
+                            base.setImageStatus(11);
+                            String ossPath = ossService.uploadWithUrl(base,pdfUrl);
+                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getOssPdfUrl, ossPath);
                         }else{
                             //失败
                             oldStatus = "2";
@@ -232,9 +236,8 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getFailCause, failCause);
                         }
                         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);
                         }