更新

PaymentClient/src/main/java/com/zhongshu/payment/client/pay/service/BasePayService.java

@@ -1,11 +1,46 @@
 package com.zhongshu.payment.client.pay.service;
 
-import com.zhongshu.payment.client.pay.model.OrderModel;
-import com.zhongshu.payment.client.pay.model.create.BaseCreateOrderModel;
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.pay.model.OrderModel;
+import com.github.microservice.pay.params.BasePayParam;
+import com.zhongshu.payment.client.model.WalletModel;
+import com.zhongshu.payment.client.model.param.OrderParam;
+import com.zhongshu.payment.client.model.param.WalletQueryParam;
+import com.zhongshu.payment.client.payModel.balance.BalanceModel;
+import com.zhongshu.payment.client.payModel.balance.BalanceQueryParam;
+import com.zhongshu.payment.client.payModel.commn.ClosePayOrderParam;
+import com.zhongshu.payment.client.payModel.commn.CreateOrderParam;
+import com.zhongshu.payment.client.payModel.commn.PayNotifyParam;
+import com.zhongshu.payment.client.payModel.commn.PayOrderParam;
+import com.zhongshu.payment.client.payModel.unionFrictionlessPay.model.OrderQueryParam;
+import jakarta.servlet.http.HttpServletRequest;
 
-public interface BasePayService<T extends BaseCreateOrderModel> {
+public interface BasePayService<T extends BasePayParam> {
 
-    //创建订单
-    OrderModel createOrder(T createOrderModel);
+    // 创建并支付订单
+    ResultContent createAndPayOrder(CreateOrderParam param);
+
+    // 查询付款账户信息
+    ResultContent<WalletModel> getWallet(WalletQueryParam param);
+
+    /**
+     * 查询渠道余额
+     *
+     * @param param
+     * @return
+     */
+    ResultContent<BalanceModel> queryBalance(BalanceQueryParam param);
+
+    // 根据本地 创建渠道支付订单
+    ResultContent createChannelOrder(OrderParam param);
+
+    // 支付订单
+    ResultContent payOrder(PayOrderParam param);
+
+    // 支付回调
+    ResultContent payNotify(HttpServletRequest request, PayNotifyParam param);
+
+    // 关闭支付订单
+    ResultContent closePayOrder(ClosePayOrderParam param);
 
 }

PaymentServer/src/main/java/com/zhongshu/payment/server/core/utils/TestSM2.java

@@ -3,6 +3,7 @@ package com.zhongshu.payment.server.core.utils;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StopWatch;