qilincloud168/ERPTurbo_Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(invoice): 更新对账发票查询条件和数据传输对象

Browse Source 
- 修改 ReconciliationInvoicePageQry 查询类，替换 reconciliationInvoiceId 字段为 dealerId、companyId、reconciliationId、invoiceDate 和 invoiceSn 字段
- 在 ReconciliationInvoiceVO 中添加 dealerVO、companyVO 和 dealerPaymentAccountVO 信息字段
- 更新多个 Assembler 类中的映射配置，包括 ReconciliationInvoiceAssembler、AuditAssembler、CostAssembler 等
- 重构多个执行器类的代码格式，统一字段注入和服务调用方式
- 移除 ProductDestroyCmdExe 中不必要的 ProductAssembler 注入
This commit is contained in:
shenyifei 2026-01-13 13:41:21 +08:00
parent 1e29eda0b4
commit b582d62a7b
179 changed files with 2338 additions and 2194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erp-turbo-business/erp-turbo-biz/pom.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

4
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationInvoiceAssembler.java
View File

@ -3,6 +3,7 @@ package com.xunhong.erp.turbo.biz.app.assembler;
import com.xunhong.erp.turbo.api.biz.dto.vo.ReconciliationInvoiceVO;
import com.xunhong.erp.turbo.biz.domain.entity.ReconciliationInvoice;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
/**
@ -11,5 +12,8 @@ import org.mapstruct.NullValueCheckStrategy;
@Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface ReconciliationInvoiceAssembler {
@Mapping(target = "dealerVO", source = "dealer")
@Mapping(target = "dealerPaymentAccountVO", source = "dealerPaymentAccount")
@Mapping(target = "companyVO", source = "company")
ReconciliationInvoiceVO toReconciliationInvoiceVO(ReconciliationInvoice reconciliationInvoice);
}

1
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductDestroyCmdExe.java
View File

@ -1,7 +1,6 @@
package com.xunhong.erp.turbo.biz.app.executor.cmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDestroyCmd;
import com.xunhong.erp.turbo.biz.app.assembler.ProductAssembler;
import com.xunhong.erp.turbo.biz.domain.gateway.ProductGateway;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

4
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ProductServiceImpl.java
View File

@ -3,8 +3,8 @@ package com.xunhong.erp.turbo.biz.app.service;
import com.xunhong.erp.turbo.api.biz.api.ProductServiceI;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductCreateCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDestroyCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDragCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd;
import com.xunhong.erp.turbo.api.biz.dto.qry.ProductListQry;
import com.xunhong.erp.turbo.api.biz.dto.qry.ProductPageQry;
import com.xunhong.erp.turbo.api.biz.dto.qry.ProductShowQry;
@ -13,10 +13,10 @@ import com.xunhong.erp.turbo.base.dto.PageDTO;
import com.xunhong.erp.turbo.biz.app.executor.cmd.ProductCreateCmdExe;
import com.xunhong.erp.turbo.biz.app.executor.cmd.ProductDestroyCmdExe;
import com.xunhong.erp.turbo.biz.app.executor.cmd.ProductUpdateCmdExe;
import com.xunhong.erp.turbo.biz.app.executor.query.ProductDragCmdExe;
import com.xunhong.erp.turbo.biz.app.executor.query.ProductListQryExe;
import com.xunhong.erp.turbo.biz.app.executor.query.ProductPageQryExe;
import com.xunhong.erp.turbo.biz.app.executor.query.ProductShowQryExe;
import com.xunhong.erp.turbo.biz.app.executor.query.ProductDragCmdExe;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;

6
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationInvoice.java
View File

@ -74,5 +74,11 @@ public class ReconciliationInvoice extends DTO {
*/
private LocalDateTime createdAt;
private Dealer dealer;
private Company company;
private DealerPaymentAccount dealerPaymentAccount;
}

2
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderGateway.java
View File

@ -15,7 +15,9 @@ public interface OrderGateway {
// 新增分步提交方法
Order saveStep1(OrderStep1Cmd orderStep1Cmd);
void saveStep2(OrderStep2Cmd orderStep2Cmd);
void saveStep3(OrderStep3Cmd orderStep3Cmd);
IPage<Order> page(OrderPageQry orderPageQry);

2
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ProductGateway.java
View File

@ -3,8 +3,8 @@ package com.xunhong.erp.turbo.biz.domain.gateway;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductCreateCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDestroyCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDragCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd;
import com.xunhong.erp.turbo.api.biz.dto.qry.ProductListQry;
import com.xunhong.erp.turbo.api.biz.dto.qry.ProductPageQry;
import com.xunhong.erp.turbo.api.biz.dto.qry.ProductShowQry;

9
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationInvoiceConvert.java
View File

@ -15,14 +15,23 @@ import org.mapstruct.NullValueCheckStrategy;
@Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface ReconciliationInvoiceConvert {
@Mapping(target = "dealer", source = "dealerDO")
@Mapping(target = "dealerPaymentAccount", source = "dealerPaymentAccountDO")
@Mapping(target = "company", source = "companyDO")
ReconciliationInvoice toReconciliationInvoice(ReconciliationInvoiceDO reconciliationInvoiceDO);
@Mapping(target = "dealerPaymentAccountDO", ignore = true)
@Mapping(target = "dealerDO", ignore = true)
@Mapping(target = "companyDO", ignore = true)
@Mapping(target = "version", ignore = true)
@Mapping(target = "updatedAt", ignore = true)
@Mapping(target = "isDelete", ignore = true)
@Mapping(target = "createdAt", ignore = true)
ReconciliationInvoiceDO toReconciliationInvoiceDO(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd);
@Mapping(target = "dealerPaymentAccountDO", ignore = true)
@Mapping(target = "dealerDO", ignore = true)
@Mapping(target = "companyDO", ignore = true)
@Mapping(target = "version", ignore = true)
@Mapping(target = "updatedAt", ignore = true)
@Mapping(target = "isDelete", ignore = true)

14
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationInvoiceDO.java
View File

@ -12,7 +12,6 @@ import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
@ -83,11 +82,14 @@ public class ReconciliationInvoiceDO extends BaseDO<ReconciliationInvoiceDO> {
@TableField(value = "remark")
private String remark;
/**
* 创建时间
*/
@TableField(value = "created_at")
private LocalDateTime createdAt;
@TableField(exist = false)
private DealerDO dealerDO;
@TableField(exist = false)
private CompanyDO companyDO;
@TableField(exist = false)
private DealerPaymentAccountDO dealerPaymentAccountDO;
}

22
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationPaymentDO.java
View File

@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountCategoryEnum;
import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountTypeEnum;
import com.xunhong.erp.turbo.datasource.domain.entity.BaseDO;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
/**
* @author shenyifei
@ -53,13 +57,13 @@ public class ReconciliationPaymentDO extends BaseDO<ReconciliationPaymentDO> {
* 账户类别：1_对公账户；2_私人账户
*/
@TableField(value = "account_category")
private Boolean accountCategory;
private CompanyPaymentAccountCategoryEnum accountCategory;
/**
* 账户类型：1_银行卡；2_支付宝；3_微信
*/
@TableField(value = "account_type")
private Boolean accountType;
private CompanyPaymentAccountTypeEnum accountType;
/**
* 银行名称
@ -88,14 +92,20 @@ public class ReconciliationPaymentDO extends BaseDO<ReconciliationPaymentDO> {
/**
* 回款时间
*/
@TableField(value = "return_at")
private LocalDateTime returnAt;
@TableField(value = "paid_at")
private LocalDateTime paidAt;
/**
* 回款金额
*/
@TableField(value = "return_amount")
private BigDecimal returnAmount;
@TableField(value = "paid_amount")
private BigDecimal paidAmount;
/**
* 回款凭证
*/
@TableField(value = "paid_credentials", typeHandler = JacksonTypeHandler.class)
private List<String> paidCredentials;
/**
* 备注

1
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java
View File

@ -14,7 +14,6 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.CompanyShowQry;
import com.xunhong.erp.turbo.biz.domain.entity.Company;
import com.xunhong.erp.turbo.biz.domain.gateway.CompanyGateway;
import com.xunhong.erp.turbo.biz.infrastructure.convert.CompanyConvert;
import com.xunhong.erp.turbo.biz.infrastructure.entity.BoxProductDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.CompanyDO;
import com.xunhong.erp.turbo.biz.infrastructure.mapper.CompanyMapper;
import lombok.RequiredArgsConstructor;

1
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java
View File

@ -774,6 +774,7 @@ public class OrderGatewayImpl implements OrderGateway {
OrderVehicleDO orderVehicleDO = orderVehicleConvert.toOrderVehicleDO(orderVehicle);
if (orderVehicle.getVehicleId() != null) {
orderVehicleDO.setVehicleId(orderVehicle.getVehicleId());
orderVehicleMapper.updateById(orderVehicleDO);
} else {
// 检查是否已存在车辆信息

47
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationInvoiceGatewayImpl.java
View File

@ -1,5 +1,7 @@
package com.xunhong.erp.turbo.biz.infrastructure.gateway;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -13,13 +15,24 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.ReconciliationInvoiceShowQry;
import com.xunhong.erp.turbo.biz.domain.entity.ReconciliationInvoice;
import com.xunhong.erp.turbo.biz.domain.gateway.ReconciliationInvoiceGateway;
import com.xunhong.erp.turbo.biz.infrastructure.convert.ReconciliationInvoiceConvert;
import com.xunhong.erp.turbo.biz.infrastructure.entity.CompanyDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.DealerDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.DealerPaymentAccountDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.ReconciliationInvoiceDO;
import com.xunhong.erp.turbo.biz.infrastructure.mapper.CompanyMapper;
import com.xunhong.erp.turbo.biz.infrastructure.mapper.DealerMapper;
import com.xunhong.erp.turbo.biz.infrastructure.mapper.DealerPaymentAccountMapper;
import com.xunhong.erp.turbo.biz.infrastructure.mapper.ReconciliationInvoiceMapper;
import com.xunhong.erp.turbo.biz.util.SerialNumberGenerator;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @author shenyifei
@ -30,6 +43,10 @@ public class ReconciliationInvoiceGatewayImpl implements ReconciliationInvoiceGa
private final ReconciliationInvoiceMapper reconciliationInvoiceMapper;
private final ReconciliationInvoiceConvert reconciliationInvoiceConvert;
private final DealerMapper dealerMapper;
private final CompanyMapper companyMapper;
private final DealerPaymentAccountMapper dealerPaymentAccountMapper;
@Override
public ReconciliationInvoice save(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd) {
ReconciliationInvoiceDO reconciliationInvoiceDO = reconciliationInvoiceConvert.toReconciliationInvoiceDO(reconciliationInvoiceCreateCmd);
@ -42,11 +59,41 @@ public class ReconciliationInvoiceGatewayImpl implements ReconciliationInvoiceGa
@Override
public IPage<ReconciliationInvoice> page(ReconciliationInvoicePageQry reconciliationInvoicePageQry) {
LambdaQueryWrapper<ReconciliationInvoiceDO> queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class);
queryWrapper.eq(Objects.nonNull(reconciliationInvoicePageQry.getReconciliationId()), ReconciliationInvoiceDO::getReconciliationId, reconciliationInvoicePageQry.getReconciliationId());
queryWrapper.like(StrUtil.isNotBlank(reconciliationInvoicePageQry.getInvoiceSn()), ReconciliationInvoiceDO::getInvoiceSn, reconciliationInvoicePageQry.getInvoiceSn());
queryWrapper.eq(Objects.nonNull(reconciliationInvoicePageQry.getCompanyId()), ReconciliationInvoiceDO::getCompanyId, reconciliationInvoicePageQry.getCompanyId());
queryWrapper.eq(Objects.nonNull(reconciliationInvoicePageQry.getDealerId()), ReconciliationInvoiceDO::getDealerId, reconciliationInvoicePageQry.getDealerId());
if (CollUtil.isNotEmpty(reconciliationInvoicePageQry.getInvoiceDate())) {
queryWrapper.between(ReconciliationInvoiceDO::getInvoiceDate, reconciliationInvoicePageQry.getInvoiceDate().get(0), reconciliationInvoicePageQry.getInvoiceDate().get(1));
}
queryWrapper.orderByDesc(ReconciliationInvoiceDO::getCreatedAt);
IPage<ReconciliationInvoiceDO> page = new Page<>(reconciliationInvoicePageQry.getPageIndex(), reconciliationInvoicePageQry.getPageSize());
page = reconciliationInvoiceMapper.selectPage(page, queryWrapper);
Set<Long> dealerIdList = page.getRecords().stream().map(ReconciliationInvoiceDO::getDealerId).collect(Collectors.toSet());
if (CollUtil.isNotEmpty(dealerIdList)) {
List<DealerDO> dealerDOList = dealerMapper.selectByIds(dealerIdList);
Map<Long, DealerDO> dealerDOMap = dealerDOList.stream().collect(Collectors.toMap(DealerDO::getDealerId, Function.identity()));
page.getRecords().forEach(reconciliationInvoiceDO -> reconciliationInvoiceDO.setDealerDO(dealerDOMap.get(reconciliationInvoiceDO.getDealerId())));
}
Set<Long> companyIdList = page.getRecords().stream().map(ReconciliationInvoiceDO::getCompanyId).collect(Collectors.toSet());
if (CollUtil.isNotEmpty(companyIdList)) {
List<CompanyDO> companyDOList = companyMapper.selectByIds(companyIdList);
Map<Long, CompanyDO> companyDOMap = companyDOList.stream().collect(Collectors.toMap(CompanyDO::getCompanyId, Function.identity()));
page.getRecords().forEach(reconciliationInvoiceDO -> reconciliationInvoiceDO.setCompanyDO(companyDOMap.get(reconciliationInvoiceDO.getCompanyId())));
}
Set<Long> dealerPaymentAccountIdList = page.getRecords().stream().map(ReconciliationInvoiceDO::getAccountId).collect(Collectors.toSet());
if (CollUtil.isNotEmpty(dealerPaymentAccountIdList)) {
List<DealerPaymentAccountDO> dealerPaymentAccountDOList = dealerPaymentAccountMapper.selectByIds(dealerPaymentAccountIdList);
Map<Long, DealerPaymentAccountDO> dealerPaymentAccountDOMap = dealerPaymentAccountDOList.stream().collect(Collectors.toMap(DealerPaymentAccountDO::getAccountId, Function.identity()));
page.getRecords().forEach(reconciliationInvoiceDO -> reconciliationInvoiceDO.setDealerPaymentAccountDO(dealerPaymentAccountDOMap.get(reconciliationInvoiceDO.getAccountId())));
}
return page.convert(reconciliationInvoiceConvert::toReconciliationInvoice);
}

1
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderMapper.java
View File

@ -20,6 +20,7 @@ import java.util.Set;
public interface OrderMapper extends BaseMapper<OrderDO> {
List<OrderDO> selectByOrderIdList(@Param("orderIdList") Set<Long> orderIdList);
OrderDO selectByOrderId(@Param("orderId") Long orderId);
IPage<OrderDO> selectPage(IPage<OrderDO> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<OrderDO> queryWrapper, @Param("query") OrderPageQry orderPageQry);

2
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/ProductMapper.java
View File

@ -6,8 +6,6 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
/**
* @author shenyifei
*/

1
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/SupplierInvoiceMapper.java
View File

@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
/**
* 发票记录表Mapper
*
* @author shenyifei
*/
@Mapper

4
erp-turbo-business/erp-turbo-biz/src/main/resources/application.yml
View File

@ -6,9 +6,5 @@ spring:
config:
import: classpath:cache.yml,classpath:datasource.yml,classpath:rpc.yml,classpath:sa-token.yml
logging:
level:
com.xunhong.erp.turbo.third.mapper: debug
server:
port: 8089

6
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/AuditMapper.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.AuditMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.AuditDO">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.AuditDO">
<result property="auditId" column="audit_id"/>
<result property="subjectId" column="subject_id"/>
<result property="subjectType" column="subject_type"/>

9
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/BoxSpecMapper.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.BoxSpecMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.BoxSpecDO">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.BoxSpecMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.BoxSpecDO">
<result property="specId" column="spec_id"/>
<result property="name" column="name"/>
<result property="sort" column="sort"/>

6
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CostMapper.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.CostMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.CostDO">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.CostDO">
<result property="costId" column="cost_id"/>
<result property="type" column="type"/>
<result property="belong" column="belong"/>

12
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/DealerAccountRecordMapper.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.DealerAccountRecordMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.DealerAccountRecordDO">
<result property="dealerAccountRecordId" column="dealer_account_record_id"/>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.DealerAccountRecordMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.DealerAccountRecordDO">
<result property="dealerAccountRecordId"
column="dealer_account_record_id"/>
<result property="recordSn" column="record_sn"/>
<result property="dealerId" column="dealer_id"/>
<result property="orderId" column="order_id"/>

9
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseCostMapper.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ExpenseCostMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.ExpenseCostDO">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ExpenseCostMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.ExpenseCostDO">
<result property="expenseCostId" column="expense_cost_id"/>
<result property="expenseRecordId" column="expense_record_id"/>
<result property="costId" column="cost_id"/>

9
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseProvisionMapper.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ExpenseProvisionMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.ExpenseProvisionDO">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ExpenseProvisionMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.ExpenseProvisionDO">
<result property="expenseProvisionId" column="expense_provision_id"/>
<result property="expenseRecordId" column="expense_record_id"/>
<result property="dealerName" column="dealer_name"/>

9
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseRecordMapper.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ExpenseRecordMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.ExpenseRecordDO">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ExpenseRecordMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.ExpenseRecordDO">
<result property="expenseRecordId" column="expense_record_id"/>
<result property="recordDate" column="record_date"/>
<result property="totalProvision" column="total_provision"/>

9
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostItemMapper.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.OrderCostItemMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderCostItemDO">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.OrderCostItemMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderCostItemDO">
<id property="orderCostItemId" column="order_cost_item_id"/>
<result property="orderId" column="order_id"/>
<result property="costItemId" column="cost_item_id"/>

3
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml
View File

@ -94,7 +94,8 @@
ov.dealer_id,
ov.dealer_name
FROM order_cost oc
LEFT JOIN order_vehicle ov ON oc.order_id = ov.order_id AND ov.is_delete = 0
LEFT JOIN order_vehicle ov ON oc.order_id = ov.order_id AND ov.is_delete
= 0
LEFT JOIN `order` po ON oc.order_id = po.order_id AND
po.is_delete = 0
WHERE oc.order_id = #{orderId}

3
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderMapper.xml
View File

@ -169,7 +169,8 @@
<where>
po.is_delete = 0
<if test="reconciliationIdList != null and reconciliationIdList.size() > 0">
AND po.order_id IN (select order_id from reconciliation_item where
AND po.order_id IN (select order_id from reconciliation_item
where
reconciliation_id in
<foreach item="item" collection="reconciliationIdList"
separator=","

6
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderRebateMapper.xml
View File

@ -28,7 +28,8 @@
ore.*,
po.state as po_state
FROM order_rebate ore
LEFT JOIN order_vehicle ov ON ore.order_id = ov.order_id AND ov.is_delete = 0
LEFT JOIN order_vehicle ov ON ore.order_id = ov.order_id AND
ov.is_delete = 0
LEFT JOIN `order` po ON ore.order_id = po.order_id AND po.is_delete = 0
<where>
ore.is_delete = 0
@ -43,7 +44,8 @@
</if>
<if test="query.poStates != null and query.poStates.size() > 0">
AND po.state IN
<foreach collection="query.poStates" item="state" open="(" separator="," close=")">
<foreach collection="query.poStates" item="state" open="("
separator="," close=")">
#{state.type}
</foreach>
</if>

15
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml
View File

@ -67,10 +67,12 @@
resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderSupplierDO"
resultMap="BaseResultMap">
SELECT
os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name, si.invoice_sn, si.invoice_img, si.registration_time,
os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name,
si.invoice_sn, si.invoice_img, si.registration_time,
po.state as po_state
FROM order_supplier os
LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id AND
LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id
AND
si.is_delete = 0
LEFT JOIN order_vehicle ov ON os.order_id = ov.order_id AND ov.is_delete
= 0
@ -115,11 +117,14 @@
resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderSupplierDO"
resultMap="BaseResultMap">
SELECT
os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name, si.invoice_sn, si.invoice_img, si.registration_time
os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name,
si.invoice_sn, si.invoice_img, si.registration_time
FROM order_supplier os
LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id AND
LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id
AND
si.is_delete = 0
LEFT JOIN payment_task_supplier pts ON os.order_supplier_id = pts.order_supplier_id AND pts.is_delete = 0
LEFT JOIN payment_task_supplier pts ON os.order_supplier_id =
pts.order_supplier_id AND pts.is_delete = 0
WHERE pts.payment_task_id = #{paymentTaskId}
</select>
</mapper>

9
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskMapper.xml
View File

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.PaymentTaskMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.PaymentTaskDO">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.PaymentTaskMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.PaymentTaskDO">
<result property="paymentTaskId" column="payment_task_id"/>
<result property="taskName" column="task_name"/>
<result property="taskType" column="task_type"/>

12
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskSupplierMapper.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.PaymentTaskSupplierMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.PaymentTaskSupplierDO">
<result property="paymentTaskSupplierId" column="payment_task_supplier_id"/>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.PaymentTaskSupplierMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.PaymentTaskSupplierDO">
<result property="paymentTaskSupplierId"
column="payment_task_supplier_id"/>
<result property="paymentTaskId" column="payment_task_id"/>
<result property="orderSupplierId" column="order_supplier_id"/>
<result property="orderId" column="order_id"/>

3
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationMapper.xml
View File

@ -30,7 +30,8 @@
<where>
r.is_delete = 0
<if test="query.orderId">
AND r.order_id in (select order_id from reconciliation_item where order_id = #{query.orderId})
AND r.order_id in (select order_id from reconciliation_item
where order_id = #{query.orderId})
</if>
<if test="ew != null">
<if test="ew.nonEmptyOfWhere">

12
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationPaymentMapper.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ReconciliationPaymentMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.ReconciliationPaymentDO">
<result property="reconciliationPaymentId" column="reconciliation_payment_id"/>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ReconciliationPaymentMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.ReconciliationPaymentDO">
<result property="reconciliationPaymentId"
column="reconciliation_payment_id"/>
<result property="reconciliationId" column="reconciliation_id"/>
<result property="dealerId" column="dealer_id"/>
<result property="companyId" column="company_id"/>

12
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/reconciliationInvoiceMapper.xml
View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ReconciliationInvoiceMapper">
<resultMap id="BaseResultMap" type="com.xunhong.erp.turbo.biz.infrastructure.entity.ReconciliationInvoiceDO">
<result property="reconciliationInvoiceId" column="reconciliation_invoice_id"/>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.xunhong.erp.turbo.biz.infrastructure.mapper.ReconciliationInvoiceMapper">
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.ReconciliationInvoiceDO">
<result property="reconciliationInvoiceId"
column="reconciliation_invoice_id"/>
<result property="reconciliationId" column="reconciliation_id"/>
<result property="invoiceSn" column="invoice_sn"/>
<result property="dealerId" column="dealer_id"/>

4
erp-turbo-business/erp-turbo-facade/src/main/resources/application.yml
View File

@ -6,9 +6,5 @@ spring:
config:
import: classpath:cache.yml,classpath:datasource.yml,classpath:rpc.yml,classpath:sa-token.yml
logging:
level:
com.xunhong.erp.turbo.third.mapper: debug
server:
port: 8089

6
erp-turbo-business/erp-turbo-rbac/src/main/resources/mapper/MenuMapper.xml
View File

@ -26,7 +26,8 @@
<update id="batchResetSort">
UPDATE menu t
JOIN (SELECT menu_id, (ROW_NUMBER() OVER (ORDER BY sort) - 1) * 1000 AS new_sort
JOIN (SELECT menu_id, (ROW_NUMBER() OVER (ORDER BY sort) - 1) * 1000 AS
new_sort
FROM menu WHERE menu_id = #{menuId} AND platform_id = #{platformId}
<if test='pid != null'>
AND pid = #{pid}
@ -36,7 +37,8 @@
</if>
) AS sorted_rows
ON t.menu_id = sorted_rows.menu_id
SET t.sort = sorted_rows.new_sort WHERE t.menu_id = #{menuId} AND platform_id = #{platformId}
SET t.sort = sorted_rows.new_sort WHERE t.menu_id = #{menuId} AND
platform_id = #{platformId}
<if test='pid != null'>
AND pid = #{pid}
</if>

1
erp-turbo-business/erp-turbo-user/src/main/java/com/xunhong/erp/turbo/user/app/service/EmployeeServiceImpl.java
View File

@ -1,4 +1,3 @@
package com.xunhong.erp.turbo.user.app.service;
import com.xunhong.erp.turbo.api.user.api.EmployeeServiceI;

19
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationInvoicePageQry.java
View File

@ -5,6 +5,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.List;
/**
* @author shenyifei
*/
@ -13,7 +16,19 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
public class ReconciliationInvoicePageQry extends PageQuery {
@Schema(title = "对账发票ID", type = "string")
private Long reconciliationInvoiceId;
@Schema(title = "经销商ID", type = "string")
private Long dealerId;
@Schema(title = "公司ID", type = "string")
private Long companyId;
@Schema(title = "对账ID", type = "string")
private Long reconciliationId;
@Schema(title = "发票日期", type = "string")
private List<LocalDate> invoiceDate;
@Schema(title = "发票编号", type = "string")
private String invoiceSn;
}

9
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationInvoiceVO.java
View File

@ -85,5 +85,14 @@ public class ReconciliationInvoiceVO extends DTO {
@Schema(title = "创建时间")
private LocalDateTime createdAt;
@Schema(title = "经销商信息")
private DealerVO dealerVO;
@Schema(title = "公司信息")
private CompanyVO companyVO;
@Schema(title = "经销商账户信息")
private DealerPaymentAccountVO dealerPaymentAccountVO;
}