diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java index ffd161e9..2449ba65 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java @@ -1,5 +1,6 @@ package com.jero.pack.controller; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -22,6 +23,8 @@ import com.jero.pack.entity.PayPackCompany; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.pack.service.IPayPackCompanyService; +import com.jero.pack.vo.PayPackCompanyProjectInput; +import com.jero.project.entity.PayCommonProject; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import lombok.extern.slf4j.Slf4j; @@ -73,6 +76,19 @@ public class PayPackCompanyController extends JeroController list = pageList.getRecords(); list.forEach(p->{ + // 获取 打包费用,实际到账金额 + PayPackCompanyProjectInput input = new PayPackCompanyProjectInput(); + input.setCompanyId(p.getCompanyId()); + input.setPackId(p.getId()); + PayCommonProject payCommonProject = payPackCompanyService.queryPackListCount(input); + if(!Objects.isNull(payCommonProject)){ + payCommonProject.setReceivableAmount(payCommonProject.getReceivableAmount()); + payCommonProject.setPaidAmount(payCommonProject.getPaidAmount()); + }else{ + payCommonProject.setReceivableAmount(new BigDecimal("0.00")); + payCommonProject.setPaidAmount(new BigDecimal("0.00")); + } + // todo 获取开票金额 }); } @@ -93,7 +109,6 @@ public class PayPackCompanyController extends JeroController { + /** + * @Description 查询金额 + * @Author lqt + * @Date 2021/9/13 + * @Param + * @Return + * @Exception + */ + PayCommonProject queryPackListCount(PayPackCompanyProjectInput input); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml index 80b5849c..e47584a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyMapper.xml @@ -1,5 +1,62 @@ - + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java index 04d601a9..6d6210bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/IPayPackCompanyService.java @@ -2,6 +2,8 @@ package com.jero.pack.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.pack.entity.PayPackCompany; +import com.jero.pack.vo.PayPackCompanyProjectInput; +import com.jero.project.entity.PayCommonProject; /** * @Description: pay_pack_company @@ -28,4 +30,13 @@ public interface IPayPackCompanyService extends IService { * @Exception */ void editPayPackCompany(PayPackCompany payPackCompany); + /** + * @Description 查询金额 + * @Author lqt + * @Date 2021/9/13 + * @Param + * @Return + * @Exception + */ + PayCommonProject queryPackListCount(PayPackCompanyProjectInput input); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java index fffd4de1..4bfa73be 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyServiceImpl.java @@ -7,6 +7,8 @@ import com.jero.common.exception.JeroBootException; import com.jero.pack.entity.PayPackCompany; import com.jero.pack.mapper.PayPackCompanyMapper; import com.jero.pack.service.IPayPackCompanyService; +import com.jero.pack.vo.PayPackCompanyProjectInput; +import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; @@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.Arrays; import java.util.Objects; @@ -35,6 +38,8 @@ public class PayPackCompanyServiceImpl extends ServiceImpl