...
|
...
|
@@ -1034,8 +1034,9 @@ public class PaymentServiceImpl implements IPaymentService { |
|
|
try {
|
|
|
// 加新流水
|
|
|
addSuccessTradeBills(tradeBills);
|
|
|
logger.info("{}, mark paid success.", logTag);
|
|
|
} catch (Exception e) {
|
|
|
logger.warn("{}, refund fail.", logTag, e);
|
|
|
logger.warn("{}, mark paid fail.", logTag, e);
|
|
|
releaseLock(logTag, lockKey);
|
|
|
String message = "订单号:" + tradeBills.getOrderCode() + ",操作类型(已打款),流水id=" + tradeBills.getId() + ",msg=" + e.getMessage();
|
|
|
throwServiceException(e, 500, "退款失败[" + message + "]");
|
...
|
...
|
@@ -1082,15 +1083,15 @@ public class PaymentServiceImpl implements IPaymentService { |
|
|
PayRefundBo refundBo = null;
|
|
|
try {
|
|
|
|
|
|
logger.warn("{}, refund money is {}", logTag, tradeBills);
|
|
|
logger.info("{}, refund money is {}", logTag, tradeBills);
|
|
|
refundBo = manualRefund(orderCode, amount);
|
|
|
if (refundBo.getRefundStatus() == RefundContant.PAYMENT_REFUND_RESULTCODE_SUCCESS) {
|
|
|
// 加新流水
|
|
|
addSuccessTradeBills(tradeBills);
|
|
|
logger.info("{}, refund success.", logTag);
|
|
|
} else {
|
|
|
throwServiceException(500, refundBo.getRefundMsg());
|
|
|
}
|
|
|
return;
|
|
|
} catch (Exception e) {
|
|
|
logger.warn("{}, refund fail.", logTag, e);
|
|
|
releaseLock(logTag, lockKey);
|
...
|
...
|
@@ -1122,6 +1123,7 @@ public class PaymentServiceImpl implements IPaymentService { |
|
|
} else {
|
|
|
transferWithAlipayTransfer(logTag, tradeBills, orderCode, account, amount, transfer);
|
|
|
}
|
|
|
logger.info("{}, transfer success.", logTag);
|
|
|
} catch (Exception e) {
|
|
|
logger.warn("{}, transfer fail", logTag, e);
|
|
|
releaseLock(logTag, lockKey);
|
...
|
...
|
|