Merge remote-tracking branch 'origin/master'

luqingyang

2023-11-01 090bf407236ef5be8ea7ba803a56fdcc2dcc1ce3

 consum-base/src/main/java/com/consum/base/core/util/LockManage.java

@@ -12,8 +12,8 @@
public class LockManage {
    private static final ConcurrentHashMap<String, Object> lockMap = new ConcurrentHashMap<>();

    public static Object acquireLock(Long warehouseId, Long goodsModelsId) {
        String key = warehouseId + "-" + goodsModelsId;
    public static Object acquireLock(int warehouseType, Long warehouseId, Long goodsModelsId) {
        String key = warehouseType + "-" + warehouseId + "-" + goodsModelsId;
        return lockMap.computeIfAbsent(key, k -> new Object());
    }
}