33333333333

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RechargeOrderController.java

@@ -1,13 +1,16 @@
 package com.ruoyi.web.controller.cai.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.RechargeOrder;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
+import com.ruoyi.cai.service.PayTrdConfigService;
 import com.ruoyi.cai.service.RechargeOrderService;
 import com.ruoyi.cai.service.UserService;
+import com.ruoyi.cai.trdpay.TrdPayManager;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
@@ -15,6 +18,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.BeanConvertUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,6 +41,10 @@ public class RechargeOrderController extends BaseController {
 
     private final RechargeOrderService rechargeOrderService;
     private final UserService userService;
+    @Autowired
+    private TrdPayManager trdPayManager;
+    @Autowired
+    private PayTrdConfigService payTrdConfigService;
 
     /**
      * 查询充值订单列表
@@ -48,6 +56,19 @@ public class RechargeOrderController extends BaseController {
         return TableDataInfo.build(page);
     }
 
+    @GetMapping("/checkPay")
+    public R<JSONObject> list(String orderNo, String payType) {
+        RechargeOrder order = rechargeOrderService.getByOrderNo(orderNo);
+        if(order == null){
+            return R.fail("订单不存在");
+        }
+        if(payType == null){
+            payType = order.getAppid();
+        }
+        JSONObject jsonObject = payTrdConfigService.resetOrder(order.getOrderNo(), payType, true);
+        return R.ok(jsonObject);
+    }
+
     /**
      * 获取充值订单详细信息
      *

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java

@@ -105,7 +105,7 @@ public class PayController {
                 }
                 log.info("支付宝聚合支付 使用第三方支付 dto={}",JSON.toJSONString(dto));
                 PayReturnResp orderAli = payTrdConfigService.createOrderAli(payOrderInfo);
-                orderLogsService.createBaseSuccess(dto.getOrderNo(),"四方支付宝支付");
+//                orderLogsService.createBaseSuccess(dto.getOrderNo(),"四方支付宝支付");
                 return R.ok(orderAli);
             }catch (Exception e){
                 orderLogsService.createBaseFail(dto.getOrderNo(),"四方支付宝支付",StringUtils.cat(e.getMessage(),2000));