Просмотр исходного кода

开完票后删除开票记录,还是显示已开票。 (已修复)

因为再为表添加is_delete字段导致出现问题
lipf 4 месяцев назад
Родитель
Сommit
5a8fe39dc7

+ 10 - 0
tenant/organization/src/main/java/com/jzg/organization/mapper/InsPlyIncomeInvoiceLinkMapper.java

@@ -5,8 +5,18 @@ import com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceLink;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 @Mapper
 public interface InsPlyIncomeInvoiceLinkMapper extends BaseMapper<InsPlyIncomeInvoiceLink> {
 
+    /**
+     * 删除发票和订单的关联关系
+     *
+     * @author lipf
+     * @date 2026/5/29 14:29
+     */
+    @Update("UPDATE ins_ply_income_invoice_link SET is_delete = 1 WHERE invoice_id = #{invoiceId} AND is_delete = 0")
+    void deleteByInvoiceId(@Param("invoiceId") String invoiceId);
+
 }

+ 8 - 1
tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -329,7 +329,14 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      */
     HttpResult<List<InsPlyIncome>> queryIncomeDatas(IncomeDataVO incomeDataVO);
 
-    Boolean deleteInvoiceById(String id);
+    /**
+     * 删除发票信息(便于重新开票)
+     *
+     * @param invoiceId 发票序号
+     * @author lipf
+     * @date 2026/6/9 9:13
+     */
+    Boolean deleteInvoiceById(String invoiceId);
 
     /**
      * 查询订单绑定的发票信息

+ 4 - 6
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -3,7 +3,6 @@ package com.jzg.organization.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
@@ -26,7 +25,6 @@ import com.jzg.commons.entity.finance.po.*;
 import com.jzg.commons.entity.finance.vo.*;
 import com.jzg.commons.entity.orders.po.InsOrderAdjust;
 import com.jzg.commons.entity.po.EsmInsCompany;
-import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.po.PtlAgreement;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
@@ -539,10 +537,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean deleteInvoiceById(String id) {
-        log.info("私有协议-开票记录-删除: id=[{}]",id);
-        insPlyIncomeInvoiceLinkMapper.deleteById(id);
-        return insPlyIncomeInvoiceMapper.deleteById(id) > 0;
+    public Boolean deleteInvoiceById(String invoiceId) {
+        log.info("私有协议-开票记录-删除: id=[{}]", invoiceId);
+        insPlyIncomeInvoiceLinkMapper.deleteByInvoiceId(invoiceId);
+        return insPlyIncomeInvoiceMapper.deleteById(invoiceId) > 0;
     }
 
 

+ 2 - 3
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -1221,9 +1221,8 @@
     <!-- 查询订单绑定的发票信息 lipf 2026年5月21日11:56:19 -->
     <select id="queryIncomeBindInvoice" resultType="com.jzg.commons.entity.finance.po.InsPlyIncomeInvoiceLink">
         SELECT  *  FROM
-        ins_ply_income_invoice_link
-        where
-        income_id IN
+        ins_ply_income_invoice_link ipiil
+        where  ipiil.is_delete = 0 and  ipiil.income_id IN
         <foreach collection="invoicingVo.incomeIds" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>