增加缺少的is_delete字段，并且将delete语句删除

consoleStatistics/src/main/resources/mapper/ReportUploadExcelTaskMapper.xml

@@ -20,7 +20,7 @@
         from
         report_upload_excel_task
         <where>
-            and is_delete = 0
+            is_delete = 0
             <if test="vo.uploadUserId != null and vo.uploadUserId != ''">
                 AND upload_user_id = #{vo.uploadUserId}
             </if>

partner/src/main/resources/mapper/PartnerAttributeMapper.xml

@@ -53,7 +53,7 @@
         strategy,kh_days,fall_tick,fall_amount
         from partner_rule
         <where>
-            AND is_delete = 0
+            is_delete = 0
             <if test="grade != null">
                 AND grade = #{grade}
             </if>
@@ -67,7 +67,7 @@
         id,min,max,satisfy,rule_id,requirement,strategy,cycle,type,checked,fixed_days,task_days
         from partner_attribute
         <where>
-            AND is_delete = 0
+            is_delete = 0
             AND type = 1
             AND rule_id = #{id}
         </where>
@@ -79,7 +79,7 @@
         id,min,max,satisfy,rule_id,requirement,strategy,cycle,type,checked,fixed_days,task_days
         from partner_attribute
         <where>
-            AND is_delete = 0
+            is_delete = 0
             AND type = 3
             AND rule_id = #{id}
         </where>
@@ -91,7 +91,7 @@
         id,min,max,satisfy,rule_id,requirement,strategy,cycle,type,checked,fixed_days,task_days
         from partner_attribute
         <where>
-            AND is_delete = 0
+            is_delete = 0
             AND type = 2
             AND rule_id = #{id}
         </where>

partner/src/main/resources/mapper/PartnerUserMapper.xml

@@ -67,7 +67,7 @@
         FROM
         partner_user
         <where>
-            AND is_delete = 0
+            is_delete = 0
             AND grade BETWEEN 1 AND 4
             <if test="queryVo.name != null and queryVo.name != ''">
                 and (name like concat('%', #{queryVo.name}, '%') or  mobile like concat('%', #{queryVo.name}, '%'))

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersCarUserInfoMapper.java

@@ -9,6 +9,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface InsOrdersCarUserInfoMapper extends BaseMapper<InsOrdersCarUserInfo> {
 
-    @Delete("delete from ins_orders_car_user_info where order_no = #{orderNo}")
-    void deleteOrderNo(Long orderNo);
+//    @Delete("delete from ins_orders_car_user_info where order_no = #{orderNo}")
+//    void deleteOrderNo(Long orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersKindMapper.java

@@ -8,6 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface InsOrdersKindMapper extends BaseMapper<InsOrdersKind> {
 
-    @Delete("delete from ins_orders_kind where order_no = #{orderNo}")
-    void deleteOrderNo(Long orderNo);
+//    @Delete("delete from ins_orders_kind where order_no = #{orderNo}")
+//    void deleteOrderNo(Long orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersRiskMapper.java

@@ -8,6 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface InsOrdersRiskMapper extends BaseMapper<InsOrdersRisk> {
 
-    @Delete("delete from ins_orders_risk where order_no = #{orderNo}")
-    void deleteOrderNo(Long orderNo);
+//    @Delete("delete from ins_orders_risk where order_no = #{orderNo}")
+//    void deleteOrderNo(Long orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsTaskImagesMapper.java

@@ -15,6 +15,6 @@ public interface InsTaskImagesMapper extends BaseMapper<InsTaskImages> {
     InsTaskImagesVo selectByQuoteNo(String quoteNo);
 
 
-    @Delete("delete from ins_task_images where quote_no = #{quoteNo}")
-    void removeByQuoteNo(String quoteNo);
+//    @Delete("delete from ins_task_images where quote_no = #{quoteNo}")
+//    void removeByQuoteNo(String quoteNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersCarUserInfoServiceImpl.java

@@ -29,7 +29,12 @@ public class InsOrdersCarUserInfoServiceImpl extends ServiceImpl<InsOrdersCarUse
 
     @Override
     public void deleteOrderNo(Long orderNo) {
-        baseMapper.deleteOrderNo(orderNo);
+        // 定义查询条件
+        LambdaQueryWrapper<InsOrdersCarUserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(InsOrdersCarUserInfo::getOrderNo, orderNo);
+        // 执行删除操作，返回受影响的行数
+        baseMapper.delete(lambdaQueryWrapper);
+//        baseMapper.deleteOrderNo(orderNo);
     }
 
     @Override

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersKindServiceImpl.java

@@ -58,7 +58,12 @@ public class InsOrdersKindServiceImpl extends ServiceImpl<InsOrdersKindMapper, I
 
     @Override
     public void deleteOrderNo(Long orderNo) {
-        baseMapper.deleteOrderNo(orderNo);
+        // 定义查询条件
+        LambdaQueryWrapper<InsOrdersKind> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(InsOrdersKind::getOrderNo, orderNo);
+        // 执行删除操作，返回受影响的行数
+        baseMapper.delete(lambdaQueryWrapper);
+//        baseMapper.deleteOrderNo(orderNo);
     }
 
     @Override

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersRiskServiceImpl.java

@@ -19,7 +19,12 @@ import java.util.Objects;
 public class InsOrdersRiskServiceImpl extends ServiceImpl<InsOrdersRiskMapper, InsOrdersRisk> implements InsOrdersRiskService {
     @Override
     public void deleteOrderNo(Long orderNo) {
-        baseMapper.deleteOrderNo(orderNo);
+//        baseMapper.deleteOrderNo(orderNo);
+        // 定义查询条件
+        LambdaQueryWrapper<InsOrdersRisk> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(InsOrdersRisk::getOrderNo, orderNo);
+        // 执行删除操作，返回受影响的行数
+        baseMapper.delete(lambdaQueryWrapper);
     }
 
     @Override

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsTaskImagesServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.summary.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
@@ -77,7 +78,12 @@ public class  InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper,
 
     @Override
     public void removeByQuoteNo(String quoteNo) {
-        baseMapper.removeByQuoteNo(quoteNo);
+//        baseMapper.removeByQuoteNo(quoteNo);
+        // 定义查询条件
+        LambdaQueryWrapper<InsTaskImages> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(InsTaskImages::getQuoteNo, quoteNo);
+        // 执行删除操作，返回受影响的行数
+        baseMapper.delete(lambdaQueryWrapper);
     }
 
     @Override

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

@@ -1087,22 +1087,18 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             }
 
             // 判断是否已经结算完成, 考虑回款差额
-            if (surplusPremium.compareTo(BigDecimalUtil.add(settlementVo.getActualReceivedAmount(), platformSettlementVo.getSettlementVo().getSettlementPaymentDifference())) == 0) {
-                log.info("序号为[{}]的发票已经结算完成",invoice.getId());
-                // 更新发票状态
-                invoice.setStatus("1");
-                insPlyIncomeInvoiceMapper.insert(invoice);
-                // 判断是需要更新哪个字段
-                this.updateIncomeSettlementStatus(invoice.getInvoiceType(), invoicingVo.getIncomeIds(), settlementDateTime);
-            }else{
-                log.info("invoiceId=[{}]还剩[{}]钱没有结算",settlementVo.getInvoicingId(), surplusPremium.subtract(settlementVo.getActualReceivedAmount()));
-            }
-            return true;
+            log.info("序号为[{}]的发票已经结算完成",invoice.getId());
+            // 更新发票状态
+            invoice.setStatus("1");
+            insPlyIncomeInvoiceMapper.insert(invoice);
+            // 判断是需要更新哪个字段
+            this.updateIncomeSettlementStatus(invoice.getInvoiceType(), invoicingVo.getIncomeIds(), settlementDateTime);
         } catch (Exception e) {
             log.error("平台结算异常. settlementVo=[{}]",JSONUtil.toJsonStr(settlementVo), e);
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new RuntimeException(e.getMessage());
         }
+        return true;
     }
 
     @Override