修改del_flag参数为字符串

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineCirculationLog.java

@@ -57,7 +57,7 @@ public class KxsMachineCirculationLog extends Model<KxsMachineCirculationLog> im
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsMachineDeduct.java

@@ -57,7 +57,7 @@ public class KxsMachineDeduct extends Model<KxsMachineDeduct> implements Seriali
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/model/KxsTicketTransferInfo.java

@@ -57,7 +57,7 @@ public class KxsTicketTransferInfo extends Model<KxsTicketTransferInfo> implemen
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsForAmountWithdraw.java

@@ -57,7 +57,7 @@ public class KxsForAmountWithdraw extends Model<KxsForAmountWithdraw> implements
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineAdvance.java

@@ -57,7 +57,7 @@ public class KxsMachineAdvance extends Model<KxsMachineAdvance> {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineAdvanceInfo.java

@@ -56,7 +56,7 @@ public class KxsMachineAdvanceInfo extends Model<KxsMachineAdvanceInfo> implemen
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApply.java

@@ -56,7 +56,7 @@ public class KxsMachineApply extends Model<KxsMachineApply> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApplyDetail.java

@@ -56,7 +56,7 @@ public class KxsMachineApplyDetail extends Model<KxsMachineApplyDetail> implemen
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineRecycle.java

@@ -54,7 +54,7 @@ public class KxsMachineRecycle extends Model<KxsMachineRecycle> implements Seria
      */
     @Schema(description = "删除标记，0未删除，1已删除")
     @TableLogic
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineRecycleInfo.java

@@ -61,7 +61,7 @@ public class KxsMachineRecycleInfo extends Model<KxsMachineRecycleInfo> implemen
      */
     @Schema(description = "删除标记，0未删除，1已删除")
     @TableLogic
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsSendTotal.java

@@ -56,7 +56,7 @@ public class KxsSendTotal extends Model<KxsSendTotal> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsToForAmount.java

@@ -57,7 +57,7 @@ public class KxsToForAmount extends Model<KxsToForAmount> implements Serializabl
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouse.java

@@ -57,7 +57,7 @@ public class KxsWarehouse extends Model<KxsWarehouse> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseCreditAmount.java

@@ -56,7 +56,7 @@ public class KxsWarehouseCreditAmount extends Model<KxsWarehouseCreditAmount> im
     @Schema(description = "删除标记，0未删除，1已删除")
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseLimit.java

@@ -57,7 +57,7 @@ public class KxsWarehouseLimit extends Model<KxsWarehouseLimit> implements Seria
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseMachineApply.java

@@ -57,7 +57,7 @@ public class KxsWarehouseMachineApply extends Model<KxsWarehouseMachineApply> im
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseMachineApplyDetail.java

@@ -56,7 +56,7 @@ public class KxsWarehouseMachineApplyDetail extends Model<KxsWarehouseMachineApp
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehousePartner.java

@@ -57,7 +57,7 @@ public class KxsWarehousePartner extends Model<KxsWarehousePartner> implements S
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseStock.java

@@ -56,7 +56,7 @@ public class KxsWarehouseStock extends Model<KxsWarehouseStock> implements Seria
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseStockLog.java

@@ -56,7 +56,7 @@ public class KxsWarehouseStockLog extends Model<KxsWarehouseStockLog> implements
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsWarehouseUser.java

@@ -56,7 +56,7 @@ public class KxsWarehouseUser extends Model<KxsWarehouseUser> implements Seriali
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsCampUser.java

@@ -57,7 +57,7 @@ public class KxsCampUser extends Model<KxsCampUser> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsMorning.java

@@ -56,7 +56,7 @@ public class KxsMorning extends Model<KxsMorning> implements Serializable {
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsSchoolStudy.java

@@ -56,7 +56,7 @@ public class KxsSchoolStudy extends Model<KxsSchoolStudy> implements Serializabl
     @Schema(description = "删除标记，0未删除，1已删除")
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsServiceCenter.java

@@ -57,7 +57,7 @@ public class KxsServiceCenter extends Model<KxsServiceCenter> implements Seriali
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsServiceMenu.java

@@ -57,7 +57,7 @@ public class KxsServiceMenu extends Model<KxsServiceMenu> implements Serializabl
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-transfer/src/main/java/com/kxs/transfer/api/service/sys/impl/KxsMorningServiceImpl.java

@@ -50,7 +50,7 @@ public class KxsMorningServiceImpl extends ServiceImpl<KxsMorningMapper, KxsMorn
                     morning.setStudyPerson(Integer.parseInt(validFieldDataMap.get(field).toString()));
                     break;
                 case "Status":
-                    morning.setDelFlag(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    morning.setDelFlag(validFieldDataMap.get(field).toString());
                     break;
                 case "IsBanner":
                     morning.setIsBanner(Boolean.valueOf(validFieldDataMap.get(field).toString()));
@@ -84,7 +84,7 @@ public class KxsMorningServiceImpl extends ServiceImpl<KxsMorningMapper, KxsMorn
                     break;
             }
         }
-        if(morning.getDelFlag() != null && morning.getDelFlag() == -1){
+        if(morning.getDelFlag() != null && "-1".equals(morning.getDelFlag()) ){
             baseMapper.deleteById(morning.getId());
             return;
         }

kxs-transfer/src/main/java/com/kxs/transfer/api/service/sys/impl/KxsSchoolStudyServiceImpl.java

@@ -50,7 +50,7 @@ public class KxsSchoolStudyServiceImpl extends ServiceImpl<KxsSchoolStudyMapper,
                     schoolStudy.setStudyPerson(Integer.parseInt(validFieldDataMap.get(field).toString()));
                     break;
                 case "Status":
-                    schoolStudy.setDelFlag(Integer.parseInt(validFieldDataMap.get(field).toString()));
+                    schoolStudy.setDelFlag(validFieldDataMap.get(field).toString());
                     break;
                 case "SeoTitle":
                     schoolStudy.setLecturer(validFieldDataMap.get(field).toString());
@@ -82,7 +82,7 @@ public class KxsSchoolStudyServiceImpl extends ServiceImpl<KxsSchoolStudyMapper,
                     break;
             }
         }
-        if(schoolStudy.getDelFlag() != null && schoolStudy.getDelFlag() == -1){
+        if(schoolStudy.getDelFlag() != null && "-1".equals(schoolStudy.getDelFlag()) ){
             baseMapper.deleteById(schoolStudy.getId());
             return;
         }

kxs-transfer/src/main/java/com/kxs/transfer/api/task/taskJob.java

@@ -77,6 +77,7 @@ public class taskJob {
      * 同步数据失败重新消费
      */
     @Scheduled(fixedDelay = 1000 * 60 * 5)
+//    @Scheduled(fixedDelay = 1000 * 5)
     public void tradeRepeatEntry(){
         List<KxsDtsErrorLog> list = kxsDtsErrorLogService.list(Wrappers.<KxsDtsErrorLog>lambdaQuery().eq(KxsDtsErrorLog::getOperation, OperationType.INSERT).last("limit 100"));
 

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsLeader.java

@@ -57,7 +57,7 @@ public class KxsLeader extends Model<KxsLeader> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsLeaderAmountLog.java

@@ -57,7 +57,7 @@ public class KxsLeaderAmountLog extends Model<KxsLeaderAmountLog> implements Ser
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsPartner.java

@@ -63,7 +63,7 @@ public class KxsPartner extends Model<KxsPartner> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsPartnerAmountLog.java

@@ -57,7 +57,7 @@ public class KxsPartnerAmountLog extends Model<KxsPartnerAmountLog> implements S
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsTotalDebt.java

@@ -61,7 +61,7 @@ public class KxsTotalDebt extends Model<KxsTotalDebt> implements Serializable {
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsTotalDebtLog.java

@@ -57,7 +57,7 @@ public class KxsTotalDebtLog extends Model<KxsTotalDebtLog> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserEquity.java

@@ -59,7 +59,7 @@ public class KxsUserEquity extends Model<KxsUserEquity> implements Serializable
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUserLevelLog.java

@@ -57,7 +57,7 @@ public class KxsUserLevelLog extends Model<KxsUserLevelLog> implements Serializa
      * 删除标记，0未删除，1已删除
      */
     @Schema(description = "删除标记，0未删除，1已删除")
-    private Integer delFlag;
+    private String delFlag;
 
 
     /**