init

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/ConsumeLogController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.ConsumeLog;
+import com.ruoyi.cai.domain.UserGift;
 import com.ruoyi.cai.service.ConsumeLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -58,6 +59,12 @@ public class ConsumeLogController extends BaseController {
         return R.ok(consumeLogService.getById(id));
     }
 
+    @GetMapping("/trace")
+    public R<ConsumeLog> getInfoTraceId(String traceId) {
+        ConsumeLog res = consumeLogService.getOne(Wrappers.lambdaQuery(ConsumeLog.class).eq(ConsumeLog::getTraceId,traceId).last("limit 1"));
+        return R.ok(res);
+    }
+
     /**
      * 新增消费记录
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java

@@ -4,6 +4,9 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.GuardLog;
+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.GuardLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -14,7 +17,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.BeanConvertUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -59,6 +64,12 @@ public class GuardLogController extends BaseController {
         return R.ok(guardLogService.getById(id));
     }
 
+    @GetMapping("/trace")
+    public R<GuardLog> getInfoTraceId(String traceId) {
+        GuardLog res = guardLogService.getOne(Wrappers.lambdaQuery(GuardLog.class).eq(GuardLog::getTraceId,traceId).last("limit 1"));
+        return R.ok(res);
+    }
+
     /**
      * 新增守护赠送流水
      */

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

@@ -1,6 +1,7 @@
 package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+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;
@@ -66,6 +67,15 @@ public class RechargeOrderController extends BaseController {
         return R.ok(res);
     }
 
+    @GetMapping("/trace")
+    public R<RechargeOrderAdminVo> getInfoTraceId(String traceId) {
+        RechargeOrder rechargeOrder = rechargeOrderService.getOne(Wrappers.lambdaQuery(RechargeOrder.class).eq(RechargeOrder::getTraceId,traceId).last("limit 1"));
+        RechargeOrderAdminVo res = BeanConvertUtil.convertTo(rechargeOrder, RechargeOrderAdminVo::new);
+        User user = userService.getById(res.getUserId());
+        BeanUtils.copyProperties(user,res);
+        return R.ok(res);
+    }
+
     /**
      * 新增充值订单
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java

@@ -3,7 +3,10 @@ package com.ruoyi.cai.controller.admin;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 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.domain.UserGift;
+import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
 import com.ruoyi.cai.service.UserGiftService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -14,7 +17,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.BeanConvertUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -59,6 +64,12 @@ public class UserGiftController extends BaseController {
         return R.ok(userGiftService.getById(id));
     }
 
+    @GetMapping("/trace")
+    public R<UserGift> getInfoTraceId(String traceId) {
+        UserGift res = userGiftService.getOne(Wrappers.lambdaQuery(UserGift.class).eq(UserGift::getTraceId,traceId).last("limit 1"));
+        return R.ok(res);
+    }
+
     /**
      * 新增礼物流水
      */

ruoyi-cai/src/main/resources/mapper/cai/RechargeOrderMapper.xml

@@ -40,6 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.orderNo != null and bo.orderNo != ''">
                 and t1.order_no = #{bo.orderNo}
             </if>
+            <if test="bo.traceId != null">
+                and t1.trace_id = #{bo.traceId}
+            </if>
         </where>
         order by t1.create_time desc
     </select>