Merge branches 'feature/20210707_wuping' and 'feature/20210709_日志报错修改_wuping' of…

Merge branches 'feature/20210707_wuping' and 'feature/20210709_日志报错修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20210709_日志报错修改_wuping

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -301,7 +301,8 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         //添加分布式锁，如果没有取得锁直接返回失败；整个方法执行完毕后会删掉该锁
         String paySuccessKey = PAY_SUCCESS_KEY + message.getTrans_id();
         if (!LockUtils.lockAfter(redisCache.getRedisTemplate(), paySuccessKey)) {
-            return orderAdapter.newSendPayFaileMessage();
+            //触发锁，为了日志监控状态码不告警，返回成功
+            return orderAdapter.sendPaySuccessNoticeMessage();
         }
         try {
             ConfirmOrderDto confirmOrderDto = orderAdapter.convent2ConfirmOrderDto(message);