WFC/be.wfc
2
0
Fork 0
Code Activity

fix: 补充账单管理接口

Browse Source
This commit is contained in:
caiyuchao
2025-01-03 17:47:01 +08:00
parent 1fbc95e907
commit 7d00f7fd68
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UOrderController.java
View File

@@ -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.controller.BaseController;
import org.wfc.common.core.web.domain.AjaxResult; import org.wfc.common.core.web.domain.AjaxResult;
import org.wfc.common.core.web.page.TableDataInfo; 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.UOrder;
import org.wfc.system.domain.UPackage;
import org.wfc.system.domain.UUser; import org.wfc.system.domain.UUser;
import org.wfc.system.service.IUOrderService; import org.wfc.system.service.IUOrderService;
import org.wfc.system.service.IUPackageService;
import org.wfc.system.service.IUUserService; import org.wfc.system.service.IUUserService;
import java.util.List; import java.util.List;
@@ -36,6 +39,9 @@ public class UOrderController extends BaseController {
@Autowired @Autowired
private IUUserService uUserService; private IUUserService uUserService;
@Autowired
private IUPackageService packageService;
@GetMapping("/page") @GetMapping("/page")
public TableDataInfo page(UOrder uOrder) { public TableDataInfo page(UOrder uOrder) {
startPage(); startPage();
@@ -43,10 +49,15 @@ public class UOrderController extends BaseController {
.like(StrUtil.isNotBlank(uOrder.getOrderNo()), UOrder::getOrderNo, uOrder.getOrderNo()) .like(StrUtil.isNotBlank(uOrder.getOrderNo()), UOrder::getOrderNo, uOrder.getOrderNo())
.eq(ObjectUtil.isNotNull(uOrder.getStatus()), UOrder::getStatus, uOrder.getStatus()) .eq(ObjectUtil.isNotNull(uOrder.getStatus()), UOrder::getStatus, uOrder.getStatus())
.eq(ObjectUtil.isNotNull(uOrder.getType()), UOrder::getType, uOrder.getType()) .eq(ObjectUtil.isNotNull(uOrder.getType()), UOrder::getType, uOrder.getType())
.orderByDesc(BaseData::getCreateTime)
); );
for (UOrder order : list) { for (UOrder order : list) {
UUser uUser = uUserService.getById(order.getUserId()); UUser uUser = uUserService.getById(order.getUserId());
order.setUserName(uUser.getUserName()); order.setUserName(uUser.getUserName());
if (ObjectUtil.isNotNull(order.getPackageId())) {
UPackage uPackage = packageService.getById(order.getPackageId());
order.setPackageName(uPackage.getPackageName());
}
} }
return getDataTable(list); return getDataTable(list);
} }

4
wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UOrder.java
View File

@@ -49,4 +49,8 @@ public class UOrder extends BaseData {
@Schema(description = "用户名称") @Schema(description = "用户名称")
@TableField(exist = false) @TableField(exist = false)
private String userName; private String userName;
@Schema(description = "套餐名称")
@TableField(exist = false)
private String packageName;
} }