fix: 补充套餐记录信息

wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UOrderController.java

@@ -1,6 +1,7 @@
 package org.wfc.user.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -17,7 +18,10 @@ import org.wfc.common.core.web.domain.AjaxResult;
 import org.wfc.common.core.web.page.TableDataInfo;
 import org.wfc.common.security.utils.SecurityUtils;
 import org.wfc.user.domain.UOrder;
+import org.wfc.user.domain.UPackage;
 import org.wfc.user.service.IUOrderService;
+import org.wfc.user.service.IUPackageService;
+import org.wfc.user.service.IURateLimitService;
 
 import java.util.List;
 
@@ -36,6 +40,12 @@ public class UOrderController extends BaseController {
     @Autowired
     private IUOrderService uOrderService;
 
+    @Autowired
+    private IUPackageService uPackageService;
+
+    @Autowired
+    private IURateLimitService uRateLimitService;
+
     @GetMapping("/page")
     public TableDataInfo page(UOrder uOrder) {
         startPage();
@@ -50,6 +60,17 @@ public class UOrderController extends BaseController {
         List<UOrder> list = uOrderService.list(Wrappers.<UOrder>lambdaQuery()
                 .eq(UOrder::getUserId, loginUser.getUserid()).eq(UOrder::getType, 1)
                 .orderByDesc(UOrder::getCreateTime));
+
+        for (UOrder uOrder : list) {
+            if (ObjectUtil.isNull(uOrder.getPackageId())) {
+                continue;
+            }
+            UPackage uPackage = uPackageService.getById(uOrder.getPackageId());
+            if (ObjectUtil.isNotNull(uPackage.getRateLimitId())) {
+                uPackage.setRateLimits(uRateLimitService.getById(uPackage.getRateLimitId()));
+            }
+            uOrder.setUPackage(uPackage);
+        }
         return getDataTable(list);
     }
 

wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UOrder.java

@@ -1,12 +1,13 @@
 package org.wfc.user.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import org.wfc.common.mybatis.domain.BaseData;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import org.wfc.common.mybatis.domain.BaseData;
+
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -44,4 +45,7 @@ public class UOrder extends BaseData {
 
     @Schema(description = "订单状态(0待支付 1已支付 2已取消)")
     private Integer status;
+
+    @TableField(exist = false)
+    private UPackage uPackage;
 }