Authored by LUOXC

refactor

@@ -1076,13 +1076,12 @@ public class PaymentServiceImpl implements IPaymentService { @@ -1076,13 +1076,12 @@ public class PaymentServiceImpl implements IPaymentService {
1076 return; 1076 return;
1077 } catch (Exception e) { 1077 } catch (Exception e) {
1078 logger.warn("{}, refund fail.", logTag, e); 1078 logger.warn("{}, refund fail.", logTag, e);
1079 - String alarmMsg = "订单号:" + orderCode + ",操作类型(退款),流水id=" + tradeBills.getId() + ",msg=" + e.getMessage(); 1079 + releaseLock(logTag, lockKey);
  1080 + String message = "订单号:" + orderCode + ",操作类型(退款),流水id=" + tradeBills.getId() + ",msg=" + e.getMessage();
1080 if (refundBo != null) { 1081 if (refundBo != null) {
1081 - alarmMsg += ",DETAIL=" + JSON.toJSONString(refundBo); 1082 + message += ",DETAIL=" + JSON.toJSONString(refundBo);
1082 } 1083 }
1083 - alarm("人工处理退款失败", "ufo.order.manualDeal", alarmMsg);  
1084 - releaseLock(logTag, lockKey);  
1085 - throwServiceException(e, 500, "退款失败[" + tradeBills.getId() + "]"); 1084 + throwServiceException(e, 500, "退款失败[" + message + "]");
1086 } 1085 }
1087 } 1086 }
1088 1087
@@ -1108,13 +1107,9 @@ public class PaymentServiceImpl implements IPaymentService { @@ -1108,13 +1107,9 @@ public class PaymentServiceImpl implements IPaymentService {
1108 } 1107 }
1109 } catch (Exception e) { 1108 } catch (Exception e) {
1110 logger.warn("{}, transfer fail", logTag, e); 1109 logger.warn("{}, transfer fail", logTag, e);
1111 - alarm("人工处理转账失败",  
1112 - "ufo.order.manualDeal",  
1113 - "订单号:" + orderCode + ",操作类型(转账),流水id=" + tradeBills.getId() + ",msg=" + e.getMessage());  
1114 -  
1115 releaseLock(logTag, lockKey); 1110 releaseLock(logTag, lockKey);
1116 -  
1117 - throwServiceException(e, 500, "转账失败[" + tradeBills.getId() + "]"); 1111 + String message = "订单号:" + orderCode + ",操作类型(转账),流水id=" + tradeBills.getId() + ",msg=" + e.getMessage();
  1112 + throwServiceException(e, 500, "转账失败[" + message + "]");
1118 } 1113 }
1119 } 1114 }
1120 1115