合并代码

Pu Zhibing

2024-10-16 c4664502dfdaffff555b532e65b51a57ac8b29c2

 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/AliPayController.java

@@ -1,11 +1,10 @@
package com.ruoyi.payment.controller;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.payment.ali.config.AliProperties;
import com.ruoyi.payment.ali.v2.AppletPayUtil;
import com.ruoyi.payment.ali.v2.model.PaymentReq;
import com.ruoyi.payment.ali.v2.model.PaymentResp;
import com.ruoyi.payment.ali.v2.model.QueryResp;
import com.ruoyi.payment.api.model.*;
import com.ruoyi.payment.api.vo.AliPaymentReq;
import com.ruoyi.payment.api.vo.AliPaymentResp;
import com.ruoyi.payment.api.vo.AliQueryOrder;
@@ -13,6 +12,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;

/**
 * @author zhibing.pu
@@ -78,6 +79,34 @@
         throw new RuntimeException("关闭支付宝订单失败");
      }
   }
   /**
    * 后台退款 远程调用
    */
   @PostMapping("/refund")
   public R<RefundResp> refund(@RequestBody RefundReq dto){
      return R.ok(appletPayUtil.refund(dto));
   }


   @ResponseBody
   @PostMapping(value = "/allCallBack")
   public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response) {
      try {
         String out_trade_no = aliQueryOrder.getOutTradeNo();
         String transaction_id = aliQueryOrder.getTradeNo();
         String attach = aliQueryOrder.getPassbackParams();
//         AjaxResult ajaxResult = chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
//         if (ajaxResult.isSuccess()) {
//            PrintWriter writer = response.getWriter();
//            writer.println("success");
//            writer.flush();
//            writer.close();
//         }
      } catch (Exception e) {
         e.printStackTrace();
      }
   }