更新！

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

@@ -387,7 +387,7 @@ public class ChinaumsSenselessPayService extends SuperService {
         }
         Map bodyMap = JsonUtil.toObject(JsonUtil.toJson(refundResultContent.getContent()), Map.class);
 
-        if (bodyMap.get("respCode").equals("0000")){
+        if (bodyMap.get("respCode").equals("TARGET_PROCESSING")){
             return ResultContent.buildContent(refundResultContent.getContent());
         }
         return ResultContent.buildFail(bodyMap.get("respDesc").toString());

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

@@ -354,6 +354,7 @@ public class PayCallService extends SuperService {
                 entity.setPaymentStatus("支付成功");
                 JSONObject payResult = new JSONObject();
                 payResult.set("targetOrderId", targetOrderId);
+                entity.setPayResult(payResult);
 
                 paymentProcess.setIsPaySuccess(Boolean.TRUE);
                 paymentProcess.setPayRemark("支付成功");
@@ -486,9 +487,10 @@ public class PayCallService extends SuperService {
         entity.setRefundNo(refundNo);
         String paymentNo = entity.getPaymentNo();
         log.info("支付清单号：{} 退款：{}", paymentNo, refundNo);
-        orderNoInfoService.saveInfo(refundNo, OrderNoType.Refund, entity.getPaymentType());
+        orderNoInfoService.saveInfo(paymentNo, OrderNoType.Refund, entity.getPaymentType());
         JSONObject payResult = entity.getPayResult();
         String targetOrderId = payResult.getStr("targetOrderId");
+
         BigDecimal payAmount = entity.getPayAmount();
         payAmount = payAmount.stripTrailingZeros();
         ResultContent resultContent = chinaumsSenselessPayService.refund(entity.getProjectOid(), entity.getShopOid(),
@@ -516,7 +518,7 @@ public class PayCallService extends SuperService {
     /**
      * 银联云闪付 退款回调
      *
-     * @param paymentNo state
+     * @param param state
      *                  NEW_ORDER 新订单" +
      *                  "UNKNOWN 不明确的交易状态" +
      *                  "TRADE_CLOSED 在指定时间段内未支付时关闭的交易；在交易完成撤销成功时关闭的交易；支付失败的交易;TRADE_CLOSED的交易不允许进行任何操作" +
@@ -525,7 +527,11 @@ public class PayCallService extends SuperService {
      *                  "TRADE_REFUND 订单转入退货流程,退货可能是部分也可能是全部"
      * @return
      */
-    public ResultContent unionFrictionlessPayRefundFinish(String paymentNo, com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> resultContent, String state) {
+    public ResultContent unionFrictionlessPayRefundFinish(UnionFrictionlessPayFinishModel param) {
+        String paymentNo = param.getMerOrderId();
+        com.github.microservice.pay.client.ret.ResultContent<List<TransactionLogModel>> resultContent = param.getTransactionLogModelList();
+        String state = param.getStatus();
+
         // 退款完成
         ExpenseFlow expenseFlow = expenseFlowDao.findTopByPaymentNo(paymentNo);
         orderNoInfoService.markSuccess(paymentNo);

FullCardServer/src/main/java/com/zhongshu/card/server/core/stream/ChinaumsSenselessPayStream.java

@@ -71,7 +71,7 @@ public class ChinaumsSenselessPayStream extends StreamConsumer<ChinaSenselessPay
                         merOrderId, null);
                 unionFrictionlessPayFinishModel.setTransactionLogModelList(listResultContent);
             }
-            payCallService.unionFrictionlessPayFinish(unionFrictionlessPayFinishModel);
+            payCallService.unionFrictionlessPayRefundFinish(unionFrictionlessPayFinishModel);
         }else {
             log.info("未知的订单类型或该订单已处理：{}", merOrderId);
         }