Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -2,6 +2,7 @@ package com.jzg.organization.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.finance.dto.CompanySuperviseSettlementReportDto;
 import com.jzg.commons.entity.finance.dto.ExportSuperviseSettlementExcelDto;
@@ -22,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -41,6 +43,8 @@ public class ReceivableController {
 
     @Autowired
     private ReceivableService receivableService;
+    @Autowired
+    private BaseController baseController;
 
     // 拉取已审核订单
 //    @PostMapping("pullAuditedOrder")
@@ -155,10 +159,6 @@ public class ReceivableController {
     public HttpResult otherInvoicing(@RequestBody InvoicingVo invoicingVo){
         // 设置跟单费开票
         invoicingVo.setInvoiceType("2");
-       /* boolean invoicingCheck = receivableService.invoicingCheck(invoicingVo);
-        if(!invoicingCheck){
-            return HttpResult.error("有订单占用");
-        }*/
         InvoiceingResult result = receivableService.addInvoicing(invoicingVo);
         if (Objects.nonNull(result)){
             return HttpResult.ok("开票成功",result);
@@ -411,4 +411,18 @@ public class ReceivableController {
     public void restockInsPlyIncome(@RequestBody InsOrderAdjust insOrderAdjust){
         receivableService.restockInsPlyIncome(insOrderAdjust);
     }
+
+    /**
+     * 根据应收订单的数据删除应收订单
+     *
+     * @param ids 应收订单的序号集
+     * @author lipf
+     * @date 2026/5/22 16:38
+     */
+    @PostMapping("/deleteIncomesByIds")
+    public HttpResult<String> deleteIncomesByIds(@RequestBody Long[] ids){
+        String userName = baseController.getUserName();
+        List<Long> idList = Arrays.asList(ids);
+        return receivableService.deleteIncomesByIds(idList,userName);
+    }
 }

tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -17,13 +17,6 @@ import java.util.List;
 
 public interface ReceivableService extends IService<InsPlyIncome> {
 
-    /**
-     * 获取已审核的订单
-     * @param orderNo
-     * @return
-     */
-//    InsPlyIncome getAuditedOrder(String orderNo, String orderStatus, String auditStatus);
-
     /**
      * 获取未审核的订单列表
      */
@@ -303,4 +296,14 @@ public interface ReceivableService extends IService<InsPlyIncome> {
      * @date 2026/5/21 11:59
      */
     List<String> queryIncomeBindInvoice(InvoicingVo invoicingVo);
-    }
+
+    /**
+     * 根据应收订单的数据删除应收订单
+     *
+     * @param ids 应收订单的序号集
+     * @author lipf
+     * @date 2026/5/22 16:38
+     */
+    HttpResult<String> deleteIncomesByIds(List<Long> ids, String userName);
+
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -1999,5 +1999,25 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         BigDecimal otherCost = base.multiply(new BigDecimal(otherProportionGetter.apply(income)));
         receivableSetter.accept(income, superviseCost.add(otherCost).toPlainString());
     }
+
+    /**
+     * 根据应收订单的数据删除应收订单
+     *
+     * @param ids      应收订单的序号集
+     * @param userName 操作用户
+     * @author lipf
+     * @date 2026/5/22 16:38
+     */
+    @Override
+    public HttpResult<String> deleteIncomesByIds(List<Long> ids, String userName) {
+        log.info("用户[{}]删除应收订单信息. ids=[{}]", userName, JSONUtil.toJsonStr(ids));
+        if(CollUtil.isEmpty(ids)){
+            return HttpResult.error("要删除的应收订单为空");
+        }
+        int i = baseMapper.deleteByIds(ids);
+        String msg = String.format("用户[%s]成功删除[%d]条应收订单",userName,i);
+        log.info(msg);
+        return HttpResult.ok(msg);
+    }
 }