diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UOrderController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UOrderController.java index 9f5fe05..cee9c3d 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UOrderController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UOrderController.java @@ -11,9 +11,12 @@ import org.springframework.web.bind.annotation.RestController; import org.wfc.common.core.web.controller.BaseController; import org.wfc.common.core.web.domain.AjaxResult; import org.wfc.common.core.web.page.TableDataInfo; +import org.wfc.common.mybatis.domain.BaseData; import org.wfc.system.domain.UOrder; +import org.wfc.system.domain.UPackage; import org.wfc.system.domain.UUser; import org.wfc.system.service.IUOrderService; +import org.wfc.system.service.IUPackageService; import org.wfc.system.service.IUUserService; import java.util.List; @@ -36,6 +39,9 @@ public class UOrderController extends BaseController { @Autowired private IUUserService uUserService; + @Autowired + private IUPackageService packageService; + @GetMapping("/page") public TableDataInfo page(UOrder uOrder) { startPage(); @@ -43,10 +49,15 @@ public class UOrderController extends BaseController { .like(StrUtil.isNotBlank(uOrder.getOrderNo()), UOrder::getOrderNo, uOrder.getOrderNo()) .eq(ObjectUtil.isNotNull(uOrder.getStatus()), UOrder::getStatus, uOrder.getStatus()) .eq(ObjectUtil.isNotNull(uOrder.getType()), UOrder::getType, uOrder.getType()) + .orderByDesc(BaseData::getCreateTime) ); for (UOrder order : list) { UUser uUser = uUserService.getById(order.getUserId()); order.setUserName(uUser.getUserName()); + if (ObjectUtil.isNotNull(order.getPackageId())) { + UPackage uPackage = packageService.getById(order.getPackageId()); + order.setPackageName(uPackage.getPackageName()); + } } return getDataTable(list); } diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UOrder.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UOrder.java index f079640..8057894 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UOrder.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UOrder.java @@ -49,4 +49,8 @@ public class UOrder extends BaseData { @Schema(description = "用户名称") @TableField(exist = false) private String userName; + + @Schema(description = "套餐名称") + @TableField(exist = false) + private String packageName; }