From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/CommissionController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/CommissionController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/CommissionController.java
index 4272bd3..762fe3d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/CommissionController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/CommissionController.java
@@ -2,6 +2,10 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.CommissionService;
+import com.wechat.pay.java.core.exception.ServiceException;
+import com.wechat.pay.java.service.partnerpayments.jsapi.JsapiService;
+import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByIdRequest;
+import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -12,6 +16,5 @@
public class CommissionController {
@Resource
private CommissionService commissionService;
-
-
+ public static JsapiService service;
}
--
Gitblit v1.7.1