lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

master
ljw 2025-11-08 15:00:09 +08:00
parent 25190d46bd
commit 9d5da6f075
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/discount/pojo/DiscountManageEntity.java
View File

@ -30,6 +30,9 @@ public class DiscountManageEntity {
*/
private Long companyId;
@TableField(exist = false)
private String companyName;
/**
* 费用类型：goods 产品 service 服务费
*/

25
njzscloud-svr/src/main/java/com/njzscloud/supervisory/discount/service/impl/DiscountManageServiceImpl.java
View File

@ -2,12 +2,16 @@ package com.njzscloud.supervisory.discount.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
import com.njzscloud.supervisory.biz.service.BizCompanyService;
import com.njzscloud.supervisory.discount.mapper.DiscountManageMapper;
import com.njzscloud.supervisory.discount.pojo.DiscountManageEntity;
import com.njzscloud.supervisory.discount.service.DiscountManageService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -18,8 +22,11 @@ import java.util.List;
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class DiscountManageServiceImpl extends ServiceImpl<DiscountManageMapper, DiscountManageEntity> implements DiscountManageService {
private final BizCompanyService bizCompanyService;
/**
* 新增
*/
@ -49,7 +56,12 @@ public class DiscountManageServiceImpl extends ServiceImpl<DiscountManageMapper,
*/
@Override
public DiscountManageEntity detail(Long id) {
return this.getById(id);
DiscountManageEntity entity = this.getById(id);
BizCompanyEntity companyEntity = bizCompanyService.getById(entity.getCompanyId());
if (null != companyEntity) {
entity.setCompanyName(companyEntity.getCompanyName());
}
return entity;
}
/**
@ -57,13 +69,20 @@ public class DiscountManageServiceImpl extends ServiceImpl<DiscountManageMapper,
*/
@Override
public PageResult<DiscountManageEntity> paging(PageParam pageParam, DiscountManageEntity discountManageEntity) {
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<DiscountManageEntity>lambdaQuery()
Page<DiscountManageEntity> page = this.page(pageParam.toPage(), Wrappers.<DiscountManageEntity>lambdaQuery()
.eq(discountManageEntity.getCompanyId() != null, DiscountManageEntity::getCompanyId, discountManageEntity.getCompanyId())
.eq(StrUtil.isNotBlank(discountManageEntity.getFeeType()), DiscountManageEntity::getFeeType, discountManageEntity.getFeeType())
.eq(discountManageEntity.getExpenseId() != null, DiscountManageEntity::getExpenseId, discountManageEntity.getExpenseId())
.eq(StrUtil.isNotBlank(discountManageEntity.getType()), DiscountManageEntity::getType, discountManageEntity.getType())
.eq(discountManageEntity.getDeleted() != null, DiscountManageEntity::getDeleted, Boolean.FALSE)
.orderByDesc(DiscountManageEntity::getCreateTime)));
.orderByDesc(DiscountManageEntity::getCreateTime));
for (DiscountManageEntity entity: page.getRecords()) {
BizCompanyEntity companyEntity = bizCompanyService.getById(entity.getCompanyId());
if (null != companyEntity) {
entity.setCompanyName(companyEntity.getCompanyName());
}
}
return PageResult.of(page);
}
}