Merge remote-tracking branch 'origin/master'

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

@@ -462,6 +462,8 @@ public class PayCallService extends SuperService {
         refundRecord.setRefundTime(System.currentTimeMillis());
         refundRecord.setRefundRemark(param.getRemark());
         refundRecord.setRefundNo(refundNo);
+        refundRecord.setProjectOid(entity.getProjectOid());
+        refundRecord.setPaymentType(entity.getPaymentType());
 
         com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> resultContent = balancePayService.refund(entity.getProjectOid(), entity.getShopOid(), entity.getUserId(), refundNo, payAmount, param.getRemark());
         if (resultContent.getState() == ResultState.Success) {
@@ -535,7 +537,7 @@ public class PayCallService extends SuperService {
         refundRecord.setRefundNo(refundNo);
         refundRecord.setProjectOid(entity.getProjectOid());
         refundRecord.setPaymentType(entity.getPaymentType());
-        
+
         if (resultContent.isSuccess()) {
             entity.setIsRefund(Boolean.FALSE);
             entity.setRefundRemark(param.getRemark());