Merge branch 'feature/20210810_callbackUrgentPlan_lxx' into qa

call-back-service/src/main/java/cn/freemud/service/impl/OrderCallBackServiceImpl.java

@@ -63,15 +63,20 @@ public class OrderCallBackServiceImpl implements OrderCallBackService{
         RedisLock redisLock = RedisLock.getInstance(redisTemplate);
         String lockKey = String.format(RedisKeyConstant.URGENT_CALLBACK_LOCK_KEY, requestVo.getOrderCode(),
                 requestVo.getOrderState(), requestVo.getOperateType(), requestVo.getMsgType());
+        boolean lockSucc =false;
         try {
             //简单控制，不考虑解他锁问题
-            if (!redisLock.lock(lockKey, Long.valueOf(TimeUnit.MINUTES.toSeconds(configConstants.getUrgentCallbackLockMinutes())).intValue())) {
-                ApiLog.infoMessage("订单orderCode:{} callback获取锁失败,lockKey:{}", requestVo.getOrderCode(), lockKey);
+            lockSucc = redisLock.lock(lockKey, Long.valueOf(TimeUnit.MINUTES.toSeconds(configConstants.getUrgentCallbackLockMinutes())).intValue());
+            if (!lockSucc) {
+                ApiLog.infoMessage("紧急方案 orderCode:{} 获取锁失败,lockKey:{}", requestVo.getOrderCode(), lockKey);
                 return;
             }
             mqService.sendOrderMQ(requestVo);
         } finally {
-            redisLock.unlock(lockKey);
+            if (lockSucc){
+                ApiLog.infoMessage("紧急方案 orderCode:{} 理论成功lockKey:{}", requestVo.getOrderCode(), requestVo.getRequestId(),lockKey);
+                redisLock.unlock(lockKey);
+            }
         }
     }