Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IPaylogService.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.domain.pojo.Paylog;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import java.util.List;
import java.util.Map;
@@ -20,7 +20,7 @@
 */
public interface IPaylogService extends IService<Paylog> {

    R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderID,String openId,
    R<Map<String, Object>> getPayInfo(Integer uid, Integer type,  String orderID,String openId,
                                             HttpServletRequest request);


@@ -42,5 +42,11 @@
     */
    void wxnotify(HttpServletRequest request, HttpServletResponse response);

    /**
     * @param refundDTOS 退款数据传输对象
     * @return Map<String, Object> key ：orderNo value 退款结果
     */
    Map<String, Object> refund(List<RefundDTO> refundDTOS);

    void refund1(RefundDTO refundDTOS);
}