更新

PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/unionFrictionlessPay/model/RescissionParam.java

@@ -14,9 +14,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class RescissionParam extends UnionSuperParam {
 
-    @Schema(description = "报文请求时间, 格式yyyy-MM-dd HH:mm:ss")
-    private String requestTimestamp;
-
     @Schema(description = "商户代码, 银商商户号")
     private String mid;
 

PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/unionFrictionlessPay/model/SignParam.java

@@ -15,9 +15,6 @@ public class SignParam extends UnionSuperParam {
     @Schema(description = "商户ID")
     private String shopOid;
 
-    @Schema(description = "报文请求时间, 格式yyyy-MM-dd HH:mm:ss")
-    private String requestTimestamp;
-
     @Schema(description = "商户代码 银商商户号")
     private String mid;
 

PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/unionFrictionlessPay/model/SignQueryParam.java

@@ -16,9 +16,6 @@ import org.hibernate.internal.build.AllowPrintStacktrace;
 @NoArgsConstructor
 public class SignQueryParam extends UnionSuperParam {
 
-    @Schema(description = "报文请求时间")
-    private String requestTimestamp;
-
     @Schema(description = "商户代码")
     private String mid;
 

PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/unionFrictionlessPay/model/UnionSuperParam.java

@@ -1,5 +1,6 @@
 package com.zhongshu.payment.client.payModel.unionFrictionlessPay.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -20,4 +21,6 @@ public class UnionSuperParam {
      */
     private String sign;
 
+    @Schema(description = "报文请求时间")
+    private String requestTimestamp;
 }

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/pay/impl/unionFrictionlessPay/UnionFrictionlessPayMainService.java

@@ -122,14 +122,22 @@ public class UnionFrictionlessPayMainService extends SuperPayService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 签约状态查询
+     *
+     * @param param
+     * @return
+     */
     public ResultContent signQuery(SignInParam param) {
-//        SignQueryParam signQueryParam = new SignQueryParam();
-//        signQueryParam.setRequestTimestamp(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
-//        String url = payApiConfig.getUlr(UnionFrictionlessPayApiConfig.sign);
-//        SignQueryResponse requestAPI = unionRequestService.requestAPI(url, signQueryParam, SignQueryResponse.class);
-//        if (requestAPI.isFailed()) {
-//            return ResultContent.buildFail(requestAPI.getMsg());
-//        }
+        SignQueryParam signQueryParam = new SignQueryParam();
+        signQueryParam.setRequestTimestamp(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
+
+        String url = payApiConfig.getUlr(UnionFrictionlessPayApiConfig.sign);
+        SuperResponseModel requestAPI = unionRequestService.requestAPI(url, signQueryParam, SignQueryResponse.class);
+        if (requestAPI.isFailed()) {
+            return ResultContent.buildFail(requestAPI.getMsg());
+        }
+        SignQueryResponse signQueryResponse = (SignQueryResponse) requestAPI;
 
         return ResultContent.buildSuccess();
     }