修BUG

src/main/java/com/demo/SyncDiscountBudget.java

@@ -81,6 +81,8 @@ public class SyncDiscountBudget {
                 System.out.println("-------");
                 continue;
             }
+
+//            System.out.println(itemBudget.getBudgetCode());
             JslTbsBudgetLog budgetLog = new JslTbsBudgetLog();
             budgetLog.setBudgetId(itemBudget.getBudgetId());
             budgetLog.setBudgetCode(itemBudget.getBudgetCode());

src/main/java/com/demo/cost/SyncVerificationMain.java

@@ -342,8 +342,8 @@ public class SyncVerificationMain {
         verification.setAmountRecord(checkApplyCostAmt);
         verification.setTenantId("001");
         verification.setSupplierId(tbsActivity.getSupplierId());
-        verification.setSupplierName(tbsActivity.getSupplierCode());
-        verification.setSupplierCode(tbsActivity.getSupplierName());
+        verification.setSupplierName(tbsActivity.getSupplierName());
+        verification.setSupplierCode(tbsActivity.getSupplierCode());
         verification.setUserId("0");
         verification.setUserCode("0");
         verification.setUserName("数据导入");

src/main/java/com/demo/cost/TbsMatchServiceImpl.java

@@ -63,7 +63,7 @@ public class TbsMatchServiceImpl {
 
         String updateSql3 = "UPDATE tbs_activity_center_goods g SET g.sync_budget = 1 where g.center_amount = 0";
 
-        String updateSql4 = "UPDATE tbs_cost_apply a SET a.new_budget_sync = 0 where a.budget_sync = 0";
+        String updateSql4 = "UPDATE tbs_cost_apply a SET a.new_budget_sync = 0 where a.budget_sync = 0 and a.xlt_sync=2";
         String updateSql5 = "UPDATE tbs_cost_apply AS a " +
                 "LEFT JOIN tbs_activity_center_goods AS g ON a.id = g.cost_apply_id " +
                 "SET a.new_budget_sync = 3 " +

src/main/java/com/demo/t20230704/SyncNotCheckMain.java

@@ -57,6 +57,8 @@ public class SyncNotCheckMain {
 
     String del_budget_log = "delete from tbs_budget_log where remark = 'byCancel_1' and activity_id = ?";
 
+    String sql_find_activity_release = "SELECT * FROM `vtb_fund_flow` where activity_id = ? and fund_type = 'release'";
+
     @Test
     @SneakyThrows
     public void doMain(){
@@ -85,6 +87,11 @@ public class SyncNotCheckMain {
                         return;
                     }
 
+                    if(jslDbContext.sql(sql_find_activity_release, tbsActivity.getId()).getCount()>0){
+                        System.out.println("已释放该活动费用："+ tbsActivity.getCostCode());
+                        return;
+                    }
+
                     //删除历史记录
                     jslDbContext.sql(del_fund_flow,tbsActivity.getId()).execute();
                     jslDbContext.sql(del_budget_log,tbsActivity.getId()).execute();