From c23f48c5ec15476299edadd91fa18f908d710a4f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 18 七月 2024 08:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java
index d861f56..3152b76 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java
@@ -1,21 +1,14 @@
package com.ruoyi.order.service;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.domain.pojo.Paylog;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.util.tencent.common.Signature;
-import com.ruoyi.order.util.tencent.common.XMLParser;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.order.domain.Paylog;
+import com.ruoyi.system.api.domain.dto.RefundDTO;
+import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.springframework.web.bind.annotation.RequestMapping;
/**
* <p>
@@ -27,7 +20,7 @@
*/
public interface IPaylogService extends IService<Paylog> {
- R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderID,
+ R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderID,String openId,
HttpServletRequest request);
@@ -48,4 +41,8 @@
* @param response
*/
void wxnotify(HttpServletRequest request, HttpServletResponse response);
+
+ Map<String, Object> refund(List<RefundDTO> refundDTOS);
+
+ void refund1(RefundDTO refundDTOS);
}
--
Gitblit v1.7.1