线上发货

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -4230,7 +4230,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 if (StringUtils.isEmpty(vo.getLogisticsCompany())) {
                     builder.append("数据第").append(i + 2).append("行物流公司为空！").append(System.lineSeparator());
                 }
-                if (StringUtils.isEmpty(vo.getLogisticsCompany())) {
+                if (StringUtils.isEmpty(vo.getDeliveryId())) {
                     builder.append("数据第").append(i + 2).append("行快递单号为空！").append(System.lineSeparator());
                 } else {
                     //处理订单ID信息
@@ -4240,6 +4240,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     orderCodeList.add(processedOrderNumber);
                 }
                 dto.setDeliveryName(vo.getLogisticsCompany());
+                dto.setDeliveryId(vo.getDeliveryId());
                 successList.add(dto);
 
 

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderDeliveryNoteExportVO.java

@@ -80,5 +80,8 @@ public class FsStoreOrderDeliveryNoteExportVO implements Serializable {
     @Excel(name = "订单备注",width = 20,sort = 21)
     private String orderNotes;
 
+    @Excel(name = "快递单号(必填)",width = 20,sort = 22)
+    private String deliveryId;
+
     private String keyword;
 }