合并代码

Pu Zhibing

2024-11-06 a2710eae94f1303434adfcdc3e23c5efaba151c5

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

@@ -46,7 +46,6 @@
      if(null != payment){
         AliPaymentResp aliPaymentResp = new AliPaymentResp();
         aliPaymentResp.setTradeNo(payment.getTradeNo());
         aliPaymentResp.setNotifyUrl(aliProperties.getNotifyUrl());
         return R.ok(aliPaymentResp);
      }
      return R.ok();
@@ -95,8 +94,8 @@
   @Resource
   private ChargingOrderClient chargingOrderClient;
   @ResponseBody
   @PostMapping(value = "/all")
   public void chargingOrderALICallback(@RequestBody AliQueryOrder aliQueryOrder, HttpServletResponse response) {
   @PostMapping(value = "/callBack")
   public void chargingOrderALICallback(AliQueryOrder aliQueryOrder, HttpServletResponse response) {
      try {
         String out_trade_no = aliQueryOrder.getOutTradeNo();
         String transaction_id = aliQueryOrder.getTradeNo();
@@ -113,10 +112,14 @@
               System.err.println("----收到会员回调");
               break;
            case "CD":
               chargingOrderClient.chargingOrderWXCallback(out_trade_no, transaction_id, attach);
               chargingOrderClient.chargingOrderALICallback(out_trade_no, transaction_id, attach);
               System.err.println("----充电支付回调");
               break;
         }
         PrintWriter writer = response.getWriter();
         writer.println("success");
         writer.flush();
         writer.close();
      } catch (Exception e) {
         e.printStackTrace();
      }