退款查询

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/ChinaumsSenselessPayService.java

@@ -480,10 +480,10 @@ public class ChinaumsSenselessPayService extends SuperService {
         unionFrictionlessPayFinishModel.setStatus((String) refundBody.get("status"));
         unionFrictionlessPayFinishModel.setRefundStatus((String) refundBody.get("refundStatus"));
         unionFrictionlessPayFinishModel.setRefundOrderId(refundOrderNo);
-        unionFrictionlessPayFinishModel.setMerOrderId((String) refundBody.get("mchntOrderId"));
+        unionFrictionlessPayFinishModel.setMerOrderId(((String) refundBody.get("mchntOrderId")).substring(projectConf.getOrderNoPrefix().length()));
         unionFrictionlessPayFinishModel.setTargetOrderId((String) refundBody.get("refundTargetOrderId"));
 
-        if (handle && refundBody.get("status").equals("TRADE_REFUND") && refundBody.get("refundStatus").equals("SUCCESS")) {
+        if (handle && refundBody.get("status").equals("TRADE_SUCCESS") && refundBody.get("refundStatus").equals("SUCCESS")) {
             com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> listResultContent = handleRefund(projectOid,
                     oid,
                     userId,

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

@@ -594,7 +594,7 @@ public class PayCallService extends SuperService {
 
 
         if (ObjectUtils.isNotEmpty(expenseFlow)) {
-            if (state.equals("TRADE_REFUND") && refundStatus.equals("SUCESS")) {
+            if (state.equals("TRADE_SUCCESS") && refundStatus.equals("SUCCESS")) {
                 orderNoInfoService.markSuccess(paymentNo);
                 // 退款流程 成功
                 expenseFlow.setIsRefund(Boolean.TRUE);