Merge branch 'master-fix' into dev

# Conflicts:
#	yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -3555,13 +3555,13 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
             snapshotList.add(snapshot);
             dbItem.setUpdater(String.valueOf(loginUserId));
             updateColumn(dbItem, productPrice);
-            productPriceMapper.updateById(dbItem);
+
         } else {
             dbItem = ObjectUtil.clone(productPrice);
             dbItem.setProductId(productDO.getId());
             dbItem.setWarehouseLineId(lineId);
             dbItem.setShippingChannelId(shippingChannelId);
-
+            dbItem.setId(null);
             if (dbItem.getNeedBook() == null) {
                 dbItem.setNeedBook(0);
             }
@@ -3589,11 +3589,16 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
             dbItem.setBlacklist(0);
             dbItem.setStatus(0);
             dbItem.setCreateTime(current);
-            productPriceMapper.insert(dbItem);
+
         }
         dbItem.setUpdateTime(current);
         String transportType = lineTransportTypeMap.get(lineId);
         initBasePrice(dbItem, transportType);
+        if (Objects.isNull(dbItem.getId())){
+        productPriceMapper.insert(dbItem);
+        }else {
+            productPriceMapper.updateById(dbItem);
+        }
 
         //添加修改日志,需要查询特需和阶梯，所以需要在修改之前执行
         batchAddSnapshot(snapshotList);