diff --git a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java index f7d627b..0cc6206 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java +++ b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java @@ -14,6 +14,7 @@ import com.bashi.common.utils.MessageUtils; import com.bashi.common.utils.PageUtils; import com.bashi.common.utils.SecurityUtils; import com.bashi.dk.domain.Borrow; +import com.bashi.dk.dto.admin.resp.BorrowAdminVO; import com.bashi.dk.dto.app.req.BorrowStartReq; import com.bashi.dk.dto.app.resp.BorrowInfo; import com.bashi.dk.dto.app.resp.LoanProcessResp; @@ -82,13 +83,18 @@ public class AppBorrowController { @GetMapping("/page") @ApiOperation(value = "分页查询贷款我的贷款") - public TableDataInfo page(PageParams pageParams){ + public TableDataInfo page(PageParams pageParams){ Long customerId = SecurityUtils.getLoginUser().getCustomer().getId(); LambdaQueryWrapper query = Wrappers.lambdaQuery(Borrow.class) .eq(Borrow::getCustomerId,customerId) .orderByDesc(Borrow::getCreateTime); IPage page = borrowService.page(Condition.getPage(pageParams), query); - return PageUtils.buildDataInfo(page); + TableDataInfo info = PageUtils.buildDataInfo(page, BorrowAdminVO::new); + List rows = info.getRows(); + for (BorrowAdminVO row : rows) { + row.setDefaultCoinUnit(homeSettingService.getHomeSetting().getDefaultCoinUnit()); + } + return info; } diff --git a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppCustomerController.java b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppCustomerController.java index acdb3c6..e2e0183 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppCustomerController.java +++ b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppCustomerController.java @@ -2,10 +2,14 @@ package com.bashi.dk.controller.app; import com.bashi.common.core.domain.AjaxResult; import com.bashi.common.core.domain.entity.Customer; +import com.bashi.common.utils.BeanContextUtils; +import com.bashi.common.utils.BeanConvertUtil; import com.bashi.common.utils.SecurityUtils; import com.bashi.dk.domain.CustomerInfo; +import com.bashi.dk.dto.admin.resp.CustomerAdminVO; import com.bashi.dk.service.CustomerInfoService; import com.bashi.dk.service.CustomerService; +import com.bashi.dk.service.HomeSettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -20,13 +24,17 @@ public class AppCustomerController { private CustomerInfoService customerInfoService; @Autowired private CustomerService customerService; + @Autowired + private HomeSettingService homeSettingService; @GetMapping("/info") @ApiOperation(value = "客户信息") public AjaxResult info(){ Customer customer = SecurityUtils.getLoginUser().getCustomer(); customer = customerService.getById(customer.getId()); - return AjaxResult.success(customer); + CustomerAdminVO customerAdminVO = BeanConvertUtil.convertTo(customer, CustomerAdminVO::new); + customerAdminVO.setDefaultCoinUnit(homeSettingService.getHomeSetting().getDefaultCoinUnit()); + return AjaxResult.success(customerAdminVO); } @GetMapping("/card/info") diff --git a/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/BorrowAdminVO.java b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/BorrowAdminVO.java new file mode 100644 index 0000000..c4457d7 --- /dev/null +++ b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/BorrowAdminVO.java @@ -0,0 +1,9 @@ +package com.bashi.dk.dto.admin.resp; + +import com.bashi.dk.domain.Borrow; +import lombok.Data; + +@Data +public class BorrowAdminVO extends Borrow { + private String defaultCoinUnit; +} diff --git a/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/CustomerAdminVO.java b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/CustomerAdminVO.java new file mode 100644 index 0000000..0175218 --- /dev/null +++ b/bashi-dk/src/main/java/com/bashi/dk/dto/admin/resp/CustomerAdminVO.java @@ -0,0 +1,9 @@ +package com.bashi.dk.dto.admin.resp; + +import com.bashi.common.core.domain.entity.Customer; +import lombok.Data; + +@Data +public class CustomerAdminVO extends Customer { + private String defaultCoinUnit; +}