Ver Fonte

更新!

TRX há 1 ano atrás
pai
commit
00d767aa42

+ 0 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -30,7 +30,6 @@ import com.zhongshu.card.server.core.service.pay.BalancePayService;
 import com.zhongshu.card.server.core.service.pay.ChinaumsSenselessPayService;
 import com.zhongshu.card.server.core.service.pay.SettleService;
 import com.zhongshu.card.server.core.service.paySetting.PayOrderSettingService;
-import com.zhongshu.card.server.core.service.paySetting.ProjectMainPaySettingService;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;
 import com.zhongshu.card.server.core.util.NextNoUtil;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 3
FullCardServer/src/main/java/com/zhongshu/card/server/core/stream/ChinaumsSenselessPayStream.java

@@ -3,10 +3,8 @@ package com.zhongshu.card.server.core.stream;
 import com.github.microservice.app.stream.StreamConsumer;
 import com.github.microservice.core.util.JsonUtil;
 import com.github.microservice.pay.client.model.chinaSenseless.ChinaSenselessPayRet;
-import com.github.microservice.pay.client.model.chinaSenseless.ChinaSenselessSignRet;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
 import com.github.microservice.pay.client.ret.ResultContent;
-import com.github.microservice.pay.client.service.product.SenselessPayService;
 import com.zhongshu.card.client.type.payment.OrderNoType;
 import com.zhongshu.card.server.core.model.pay.ChinaumsSenselessSrcReserve;
 import com.zhongshu.card.server.core.model.pay.UnionFrictionlessPayFinishModel;
@@ -47,7 +45,7 @@ public class ChinaumsSenselessPayStream extends StreamConsumer<ChinaSenselessPay
         String refundOrderId = chinaSenselessPayRet.getRefundOrderId();
 
         UnionFrictionlessPayFinishModel unionFrictionlessPayFinishModel = new UnionFrictionlessPayFinishModel();
-        if (refundOrderId.startsWith(srcReserve.getPrefix())){
+        if (StringUtils.isNotEmpty(refundOrderId) && refundOrderId.startsWith(srcReserve.getPrefix())){
             String refundOrderNo = refundOrderId.substring(srcReserve.getPrefix().length());
             unionFrictionlessPayFinishModel.setRefundOrderId(refundOrderNo);
         }