Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6

 src/main/java/com/mzl/flower/service/payment/RedisLockService.java

@@ -16,6 +16,7 @@
    private RedisTemplate<String, String> redisTemplate;

    public static final String LOCK_KEY_PAYMENT_NOTIFY_ = "LOCK_KEY_PAYMENT_NOTIFY_";
    public static final String LOCK_KEY_CART_ = "LOCK_KEY_CART_";

    public boolean getObjectLock(String key, String objectId){
        String kk = key + objectId;