Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -580,7 +580,7 @@ public class PayCallService extends SuperService {
      * @return
      */
     public ResultContent unionFrictionlessPayRefundFinish(UnionFrictionlessPayFinishModel param) {
-        log.info("回调时间：{}", DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
+        log.info("回调时间：{}", param.getRefundOrderId());
         log.info("回调云闪付退款回调");
         String paymentNo = param.getMerOrderId();
         com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> resultContent = param.getTransactionLogModelList();

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/RefundRecordService.java

@@ -42,8 +42,7 @@ public class RefundRecordService extends SuperService {
      * @return
      */
     public ResultContent markState(String refundNo, RefundState refundState) {
-        markState(refundNo, refundState, null);
-        return ResultContent.buildSuccess();
+        return markState(refundNo, refundState, null);
     }
 
     public ResultContent markState(String refundNo, RefundState refundState, List<TransactionLogModel> transactionLogModelList) {