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

commons/src/main/java/com/jzg/commons/entity/po/OperatorTrajectory.java

@@ -1,6 +1,8 @@
 package com.jzg.commons.entity.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.jzg.commons.util.comparble.CompareResult;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -63,4 +65,9 @@ public class OperatorTrajectory{
     @Schema(description = "比较结果")
     private List<CompareResult> compareResultList;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
 }

commons/src/main/java/com/jzg/commons/entity/rights/po/InsOrderRights.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.rights.po;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -113,4 +115,10 @@ public class InsOrderRights {
 
     @Schema(description = "接收人手机号")
     private String receiverMobile;
+
+
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
 }

commons/src/main/java/com/jzg/commons/entity/rights/po/InsOrderRightsPackage.java

@@ -1,9 +1,7 @@
 package com.jzg.commons.entity.rights.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -124,4 +122,9 @@ public class InsOrderRightsPackage {
     @Schema(description = "接收人手机号")
     private String receiverMobile;
 
+    @ExcelIgnore
+    @Schema(description = "是否删除")
+    @TableLogic
+    private Integer isDelete;
+
 }

commons/src/main/java/com/jzg/commons/mapper/OperatorTrajectoryMapper.java

@@ -9,6 +9,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface OperatorTrajectoryMapper extends BaseMapper<OperatorTrajectory>{
 
-    @Delete("delete from operator_trajectory where id = #{id} and system_code = #{systemCode}")
-    void deleteById(@Param("id") String id,@Param("systemCode") String systemCode);
+//    @Delete("delete from operator_trajectory where id = #{id} and system_code = #{systemCode}")
+//    void deleteById(@Param("id") String id,@Param("systemCode") String systemCode);
 }

commons/src/main/java/com/jzg/commons/service/impl/OperatorTrajectoryServiceImpl.java

@@ -37,7 +37,14 @@ public class OperatorTrajectoryServiceImpl implements OperatorTrajectoryService
 
     @Override
     public void deleteById(String id,String systemCode) {
-        operatorTrajectoryMapper.deleteById(id,systemCode);
+//        operatorTrajectoryMapper.deleteById(id,systemCode);
+
+        // 定义查询条件
+        LambdaQueryWrapper<OperatorTrajectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(OperatorTrajectory::getId, id)
+                .eq(OperatorTrajectory::getSystemCode, systemCode);
+        // 执行删除操作，返回受影响的行数
+        operatorTrajectoryMapper.delete(lambdaQueryWrapper);
     }
 
     @Override

partner/src/main/java/com/jzg/mapper/PartnerUserMapper.java

@@ -36,8 +36,8 @@ public interface PartnerUserMapper extends BaseMapper<PartnerUser> {
     List<TeamOverviewVo> selectTeamOverview(@Param("params") AppHomeParams params);
 
 
-    @Delete("delete from partner_user where user_id=#{id}")
-    void deleteByUserId(String id);
+//    @Delete("delete from partner_user where user_id=#{id}")
+//    void deleteByUserId(String id);
 
     Object selectStatisticsMap(@Param("grade") String grade,@Param("params")AppHomeParams params);
 

partner/src/main/java/com/jzg/service/Impl/PartnerUserServiceImpl.java

@@ -833,7 +833,12 @@ public class PartnerUserServiceImpl extends ServiceImpl<PartnerUserMapper, Partn
 
     @Override
     public void deleteByUserId(String id) {
-        baseMapper.deleteByUserId(id);
+//        baseMapper.deleteByUserId(id);
+        // 定义查询条件
+        LambdaQueryWrapper<PartnerUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PartnerUser::getUserId, id);
+        // 执行删除操作，返回受影响的行数
+        partnerUserMapper.delete(lambdaQueryWrapper);
     }
 
     @Override

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

@@ -23,5 +23,5 @@ public interface InsOrderRightsMapper extends BaseMapper<InsOrderRights> {
      * @param orderNo
      * @return
      */
-    Integer deleteByOrderNo(@Param("orderNo") String orderNo);
+//    Integer deleteByOrderNo(@Param("orderNo") String orderNo);
 }

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

@@ -17,5 +17,5 @@ public interface InsOrderRightsPackageMapper extends BaseMapper<InsOrderRightsPa
      * @param orderNo
      * @return
      */
-    Integer deleteByOrderNo(@Param("orderNo") String orderNo);
+//    Integer deleteByOrderNo(@Param("orderNo") String orderNo);
 }

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

@@ -1,6 +1,7 @@
 package com.jzg.quotation.summary.service.impl;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.rights.po.InsOrderRightsPackage;
 import com.jzg.commons.entity.rights.vo.InsOrderRightsPackageVo;
@@ -40,7 +41,14 @@ public class InsOrderRightsPackageServiceImpl extends ServiceImpl<InsOrderRights
 
     @Override
     public Integer deleteByOrderNo(String orderNo) {
-        return insOrderRightsPackageMapper.deleteByOrderNo(orderNo);
+//        return insOrderRightsPackageMapper.deleteByOrderNo(orderNo);
+        // 定义查询条件
+        LambdaQueryWrapper<InsOrderRightsPackage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(InsOrderRightsPackage::getOrderId, orderNo)
+                .eq(InsOrderRightsPackage::getDelFlag, 0);
+
+        // 执行删除操作，返回受影响的行数
+        return insOrderRightsPackageMapper.delete(lambdaQueryWrapper);
     }
 
     /**

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

@@ -1,6 +1,7 @@
 package com.jzg.quotation.summary.service.impl;
 
 import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.rights.po.InsOrderRights;
 import com.jzg.commons.entity.rights.vo.InsOrderRightsVo;
@@ -38,7 +39,13 @@ public class InsOrderRightsServiceImpl extends ServiceImpl<InsOrderRightsMapper,
 
     @Override
     public Integer deleteByOrderNo(String orderNo) {
-        return insOrderRightsMapper.deleteByOrderNo(orderNo);
+//        return insOrderRightsMapper.deleteByOrderNo(orderNo);
+        // 定义查询条件
+        LambdaQueryWrapper<InsOrderRights> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(InsOrderRights::getOrderId, orderNo)
+                .eq(InsOrderRights::getDelFlag, 0);
+        // 执行删除操作，返回受影响的行数
+        return insOrderRightsMapper.delete(lambdaQueryWrapper);
     }
 
     /**

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrderRightsMapper.xml

@@ -53,9 +53,9 @@
         order by create_time desc
     </select>
     <!-- 根据订单ID删除权益券 -->
-    <delete id="deleteByOrderNo" parameterType="string">
+   <!-- <delete id="deleteByOrderNo" parameterType="string">
         DELETE FROM ins_order_rights
         WHERE order_id = #{orderNo}
           and del_flag = 0
-    </delete>
+    </delete>-->
 </mapper>

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrderRightsPackageMapper.xml

@@ -46,9 +46,9 @@
         order by create_time desc
     </select>
     <!-- 根据订单ID删除权益券 -->
-    <delete id="deleteByOrderNo" parameterType="string">
+    <!--<delete id="deleteByOrderNo" parameterType="string">
         DELETE FROM ins_order_rights_package
         WHERE order_id = #{orderNo}
           and del_flag = 0
-    </delete>
+    </delete>-->
 </mapper>

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

@@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface PtlAgreementCostExternalTypeMapper extends BaseMapper<PtlAgreementCostExternalType> {
 
-    @Delete("delete from ptl_agreement_cost_external_type where ptl_agreement_cost_external_id = #{id}")
-    void deletePtlAgreementCostExternalId(@Param("id") Long id);
+//    @Delete("delete from ptl_agreement_cost_external_type where ptl_agreement_cost_external_id = #{id}")
+//    void deletePtlAgreementCostExternalId(@Param("id") Long id);
 }

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

@@ -8,6 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface PtlAgreementCostRuleMapper extends BaseMapper<PtlAgreementCostRule> {
 
-    @Delete("delete from ptl_agreement_cost_rule where ptl_agreement_cost_id = #{id}")
-    void deleteByPtlAgreementCostId(String id);
+//    @Delete("delete from ptl_agreement_cost_rule where ptl_agreement_cost_id = #{id}")
+//    void deleteByPtlAgreementCostId(String id);
 }

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

@@ -13,8 +13,8 @@ import java.util.List;
 @Mapper
 public interface PtlAgreementCostTypeMapper extends BaseMapper<PtlAgreementCostType> {
 
-    @Delete("DELETE FROM ptl_agreement_cost_type WHERE ptl_agreement_cost_id = #{id}")
-    void deleteByPtlAgreementCostId(String id);
+//    @Delete("DELETE FROM ptl_agreement_cost_type WHERE ptl_agreement_cost_id = #{id}")
+//    void deleteByPtlAgreementCostId(String id);
 
     List<PtlAgreementCostTypeVo> queryByCostId(String costId);
 }

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

@@ -11,6 +11,12 @@ import org.springframework.stereotype.Service;
 public class PtlAgreementCostExternalTypeServiceImpl extends ServiceImpl<PtlAgreementCostExternalTypeMapper, PtlAgreementCostExternalType> implements PtlAgreementCostExternalTypeService {
     @Override
     public void deleteByPtlAgreementCostExternalId(Long id) {
-        baseMapper.deletePtlAgreementCostExternalId(id);
+//        baseMapper.deletePtlAgreementCostExternalId(id);
+        // 定义查询条件
+        LambdaQueryWrapper<PtlAgreementCostExternalType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PtlAgreementCostExternalType::getPtlAgreementCostExternalId, id);
+
+        // 执行删除操作，返回受影响的行数
+        baseMapper.delete(lambdaQueryWrapper);
     }
 }

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

@@ -19,7 +19,13 @@ public class PtlAgreementCostRuleServiceImpl extends ServiceImpl<PtlAgreementCos
 
     @Override
     public void saveOrUpdateCostRule(List<PtlAgreementCostRule> ruleConditions, String id) {
-        baseMapper.deleteByPtlAgreementCostId(id);
+//        baseMapper.deleteByPtlAgreementCostId(id);
+        // 定义查询条件
+        LambdaQueryWrapper<PtlAgreementCostRule> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PtlAgreementCostRule::getPtlAgreementCostId, id);
+        // 执行删除操作，返回受影响的行数
+        baseMapper.delete(lambdaQueryWrapper);
+
         for (PtlAgreementCostRule ptlAgreementCostRule : ruleConditions) {
             ptlAgreementCostRule.setPtlAgreementCostId(id);
         }

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

@@ -1,6 +1,7 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.Constants;
@@ -31,7 +32,13 @@ public class PtlAgreementCostTypeServiceImpl extends ServiceImpl<PtlAgreementCos
 
     @Override
     public void saveOrUpdateCostType(List<PtlAgreementCostType> ptlAgreementCostTypeList, String id) {
-        baseMapper.deleteByPtlAgreementCostId(id);
+//        baseMapper.deleteByPtlAgreementCostId(id);
+        // 定义查询条件
+        LambdaQueryWrapper<PtlAgreementCostType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PtlAgreementCostType::getPtlAgreementCostId, id);
+        // 执行删除操作，返回受影响的行数
+        baseMapper.delete(lambdaQueryWrapper);
+
         for (PtlAgreementCostType ptlAgreementCostType : ptlAgreementCostTypeList) {
             ptlAgreementCostType.setPtlAgreementCostId(id);
         }