导入溯源码优化

fs-service/src/main/java/com/fs/course/dto/FsOrderCodeNoteDTO.java

@@ -17,8 +17,8 @@ public class FsOrderCodeNoteDTO {
     /**
      * 商品名称
      * **/
-    @Excel(name = "商品名称(必填)",width = 20,sort = 1)
-    private String productName;
+    @Excel(name = "商品编码(必填)",width = 20,sort = 1)
+    private String barCode;
 
     /**
      * 溯源码

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

@@ -5926,8 +5926,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if(d.getOrderNumber() == null){
                 return R.error("操作失败,第"+row+"行，订单号为空！");
             }
-            if(d.getProductName() == null){
-                return R.error("操作失败,第"+row+"行，商品名称为空！");
+            if(d.getBarCode() == null){
+                return R.error("操作失败,第"+row+"行，商品编码为空！");
             }
             if(checkMap.containsKey(d.getOrderNumber())){
                 return R.error("操作失败,第"+row+"行，订单重复导入！");
@@ -5939,7 +5939,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if(CollectionUtils.isNotEmpty(orderItems)){
                 for (FsStoreOrderItemScrm orderItem : orderItems) {
                     com.fs.his.dto.FsStoreCartDTO cartDTO = JSONUtil.toBean(orderItem.getJsonInfo(), com.fs.his.dto.FsStoreCartDTO.class);
-                    if (d.getProductName() .equals(cartDTO.getProductName())){
+                    if (d.getBarCode() .equals(cartDTO.getBarCode())){
                         item.setProductId(orderItem.getProductId());
                     }