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

commons/src/main/java/com/jzg/commons/entity/finance/vo/UpdateSettlementStatusVo.java

@@ -2,6 +2,7 @@ package com.jzg.commons.entity.finance.vo;
 
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  * @date 2025/7/31 17:59
  */
 
+@AllArgsConstructor
 @Data
 public class UpdateSettlementStatusVo extends PageRequest {
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrderAdjustController.java

@@ -1,6 +1,7 @@
 package com.jzg.quotation.summary.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
@@ -22,6 +23,8 @@ import com.jzg.quotation.summary.service.InsOrdersService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,6 +37,8 @@ import java.util.Objects;
 @RequiredArgsConstructor
 public class InsOrderAdjustController extends BaseController {
 
+    private static final Logger log = LoggerFactory.getLogger(InsOrderAdjustController.class);
+
     private final InsOrderAdjustService insOrderAdjustService;
     private final InsOrderAdjustInfoService insOrderAdjustInfoService;
     private final InsOrdersService insOrdersService;
@@ -80,9 +85,11 @@ public class InsOrderAdjustController extends BaseController {
     @Operation(summary = "订单批改信息添加")
     @PostMapping("/adjustAdd")
     public HttpResult adjustAdd(@Validated @RequestBody OrderAdjustAddParam param) {
+        log.info("进行订单批改adjustAdd：param=[{}]", JSONUtil.toJsonStr(param));
         String orderNo = param.getOrderNo();
         InsOrders order = insOrdersService.getById(orderNo);
         AssertionUtils.isFail(Objects.isNull(order), "订单不存在");
+        // TODO 这里需要根据 内部订单和外部订单，状态不一样
         AssertionUtils.isFail(!InsOrderStatusEnum.UNDERWRITED.getCode().equals(order.getOrderStatus()), "未承保订单不允许批改");
         LambdaQueryWrapper<InsOrderAdjust> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InsOrderAdjust::getOrderNo, orderNo);
@@ -118,6 +125,7 @@ public class InsOrderAdjustController extends BaseController {
     @Operation(summary = "订单批改信息清除")
     @DeleteMapping("/adjustRemove")
     public HttpResult adjustRemove(String orderNo) {
+        log.info("订单批改信息清除. orderNo=[{}]", orderNo);
         boolean b = insOrderAdjustService.adjustRemove(orderNo);
         return HttpResult.ok(b ? "清除成功":"清除失败");
     }

tenant/organization/src/main/java/com/jzg/organization/mapper/InsPlyIncomeInvoiceSettlementMapper.java

@@ -20,7 +20,7 @@ public interface InsPlyIncomeInvoiceSettlementMapper extends BaseMapper<InsPlyIn
      */
     SettlementVo querySettlementAndDiff(@Param("settlementIds") List<String> settlementIds);
 
-    @Select("select * from ins_ply_income_invoice_settlement ipiis where ipiis.invoice_id = #{invoiceId,jdbcType=VARCHAR} order by ipiis.create_time desc ")
+    @Select("select * from ins_ply_income_invoice_settlement ipiis where ipiis.invoice_id = #{invoiceId,jdbcType=VARCHAR} and ipiis.is_delete = 0 order by ipiis.create_time desc ")
     List<InsPlyIncomeInvoiceSettlement> querySettlementRecent(@Param("invoiceId") String invoiceId);
 
 }

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

@@ -2917,6 +2917,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                         .forEach(item -> incomeIds.add(item.getIncomeId()));
                 // 判断是需要更新哪个字段
                 this.updateIncomeSettlementStatus(insPlyIncomeInvoice.getInvoiceType(), incomeIds, settlementDateTime);
+
+                // add by lipf 2026年7月24日09:27:06 调用标识结清的接口，将未结算晋
+                this.updateSettlementStatus(new UpdateSettlementStatusVo(settlementVo.getInvoicingId(), settlementVo.getSettlementPaymentReason()));
+
             }else{
                 log.info("invoiceId=[{}]， 还剩[{}]钱没有结算",settlementVo.getInvoicingId(), surplusPremium.subtract(settlementVo.getActualReceivedAmount()));
             }