This commit is contained in:
2026-08-13 16:58:17 +08:00
parent bd523036d0
commit 38e8494216
15 changed files with 344 additions and 17 deletions
@@ -3,7 +3,20 @@ package com.baiyue.firstleg.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baiyue.firstleg.entity.InboundFeeDetailEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
@Mapper
public interface InboundFeeDetailMapper extends BaseMapper<InboundFeeDetailEntity> {
@Update("""
UPDATE fl_inbound_fee_detail
SET deleted = 1, updated_at = CURRENT_TIMESTAMP(3)
WHERE tenant_id = #{tenantId}
AND inbound_id = #{inboundId}
AND id = #{detailId}
AND deleted = 0
""")
int logicallyDelete(@Param("tenantId") long tenantId,
@Param("inboundId") long inboundId,
@Param("detailId") long detailId);
}
@@ -165,10 +165,8 @@ public class FeeItemRepository {
.eq(InboundFeeDetailEntity::getId, detail.getId()));
}
public int deleteDetail(long tenantId, long detailId) {
return feeDetails.delete(new LambdaQueryWrapper<InboundFeeDetailEntity>()
.eq(InboundFeeDetailEntity::getTenantId, tenantId)
.eq(InboundFeeDetailEntity::getId, detailId));
public int deleteDetail(long tenantId, long inboundId, long detailId) {
return feeDetails.logicallyDelete(tenantId, inboundId, detailId);
}
public int review(long tenantId, long inboundId, long detailId, String targetStatus,
@@ -159,7 +159,9 @@ public class InboundFeeDetailService {
@Transactional
public void delete(long tenantId, long inboundId, long detailId) {
requiredEditable(tenantId, inboundId, detailId);
if (repository.deleteDetail(tenantId, detailId) != 1) throw conflict("费用明细删除冲突");
if (repository.deleteDetail(tenantId, inboundId, detailId) != 1) {
throw conflict("费用明细删除冲突");
}
}
@Transactional