add

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderBaseInstallCjOrWgServiceImpl.java

@@ -466,7 +466,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
             // 条码上传
             if (StringUtils.isEmpty(code.getGreeImageId())){
                 // 上传图片
-                if (!uploadImage(orderBase, code)) {
+                if (!uploadImage(orderBase, code, synReqId)) {
                     return Boolean.FALSE;
                 }
             }
@@ -501,7 +501,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         return Boolean.TRUE;
     }
 
-    private boolean uploadImage(OrderBase orderBase, OrderInstallDetailCode code) {
+    private boolean uploadImage(OrderBase orderBase, OrderInstallDetailCode code, Long synReqId) {
         String oldFile;
         String newFile;
         oldFile = IdWorker.getIdStr() + ".jpeg";
@@ -509,7 +509,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
         // 获取文件
         newFile = oldFile;
         WebsitSH websitSH = publicService.ptshwdToshshwd(orderBase.getWebsitId(),orderBase.getMainId());
-        Boolean flag = uploadBarCodeexc(newFile, oldFile,websitSH.getWdId(), code);
+        Boolean flag = uploadBarCodeexc(newFile, oldFile,websitSH.getWdId(), code, synReqId);
         new File(newFile).delete();
         if (!flag) {
             return Boolean.FALSE;
@@ -518,7 +518,7 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
     }
 
 
-    private Boolean uploadBarCodeexc(String newFile, String oldFile,String wdno,OrderInstallDetailCode code) {
+    private Boolean uploadBarCodeexc(String newFile, String oldFile,String wdno,OrderInstallDetailCode code, Long synReqId) {
         try{
             // 1: 获取签名信息
             GreeFileResponseHelper response =  greeLogic.ossGetSignt(wdno,"GET");
@@ -546,11 +546,13 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
                 } else {
                     // 上传图片到OSS失败
                     log.info("上传图片到OSS失败");
+                    publicService.updateUploadTaskListInfo(synReqId,"order_install_detail_code.path上传图片到OSS失败");
                     return Boolean.FALSE;
                 }
             } else {
                 //  获取签名信息失败
                 log.info("获取签名信息失败");
+                publicService.updateUploadTaskListInfo(synReqId,"order_install_detail_code.path上传图片获取签名信息失败");
                 return Boolean.FALSE;
             }
             return Boolean.TRUE;
@@ -912,7 +914,6 @@ public class OrderBaseInstallCjOrWgServiceImpl implements orderBaseInstallCjOrWg
 
     private void upOutId(OrderInstallDetail detail) {
         List<OrderInstallDetail> upList = new ArrayList<>();
-        List<OrderInstallDetailCode> upCodeList = new ArrayList<>();
         List<OrderInstallDetail> detaillist = orderInstallDetailService.lambdaQuery()
                 .eq(OrderInstallDetail::getOrderBaseId, detail.getOrderBaseId())
                 .eq(OrderInstallDetail::getOutId,0).list();