Parcourir la source

订单确认异常bug

24282 il y a 1 an
Parent
commit
14e5a44cce

+ 13 - 2
sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -7,6 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.ruoyi.common.annotation.LogicIgnore;
 import com.ruoyi.common.constant.StatusConstant;
@@ -276,8 +277,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         orderOperatingLogService.save(orderOperatingLog);
 
         ObsFileUtil.saveFile(orderDto.getFileList(), orderDto.getId());
+
         // 保存 外箱不干胶图稿, 文件业务类型为 1
-        ObsFileUtil.saveFile(Collections.singletonList(orderDto.getOuterBoxSelfAdhesiveStickerFile()), orderDto.getId(), 1);
+        ObsFile outerBoxSelfAdhesiveStickerFile = orderDto.getOuterBoxSelfAdhesiveStickerFile();
+        if (ObjectUtil.isNotEmpty(outerBoxSelfAdhesiveStickerFile)) {
+            ObsFileUtil.saveFile(Collections.singletonList(outerBoxSelfAdhesiveStickerFile), orderDto.getId(), 1);
+        }
+
     }
 
     @DSTransactional
@@ -323,8 +329,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         }
 
         ObsFileUtil.editFile(orderDto.getFileList(), orderDto.getId());
+
         // 更新 外箱不干胶图稿
-        ObsFileUtil.editFile(Collections.singletonList(orderDto.getOuterBoxSelfAdhesiveStickerFile()), orderDto.getId(), 1);
+        ObsFile outerBoxSelfAdhesiveStickerFile = orderDto.getOuterBoxSelfAdhesiveStickerFile();
+        if (ObjectUtil.isNotEmpty(outerBoxSelfAdhesiveStickerFile)) {
+            ObsFileUtil.editFile(Collections.singletonList(outerBoxSelfAdhesiveStickerFile), orderDto.getId(), 1);
+        }
+
     }
 
     @DSTransactional