TRX hace 1 año
padre
commit
1ee053e528

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -52,7 +52,7 @@ public class ExpenseFlow extends SuperMain {
     private String schoolOid;
 
     @Schema(description = "卡片的编号,也是终端刷卡的 卡号")
-    private String cardNo;
+    private String cardNo = "";
 
     @Schema(description = "卡片信息")
     private CardInfo cardInfo;

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

@@ -376,6 +376,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             entity.setVerifyParamMsg("支付方式不支持");
             return;
         }
+        entity.setVerifyParamIsSuccess(Boolean.TRUE);
+        entity.setVerifyParamMsg("参数验证成功");
     }
 
     /**
@@ -409,6 +411,11 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         log.info("支付结果:{}", apiResponseModel);
         if (apiResponseModel.isSuccess()) {
             // 关联参数
+            WxPayResult wxPayResult = apiResponseModel.toBean(WxPayResult.class);
+            String tradeNo = wxPayResult.getTradeNo();
+            if (StringUtils.isNotEmpty(tradeNo)) {
+                entity.setOrderNo(tradeNo);
+            }
             entity.setPaymentStatus("支付成功");
             entity.setIsPaySuccess(Boolean.TRUE);
             entity.setPayRemark("支付成功");