调整

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -10,16 +10,20 @@ import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
 import com.qs.serve.modules.bir.entity.vo.*;
+import com.qs.serve.modules.bir.mapper.BirBaseActivityMapper;
 import com.qs.serve.modules.bir.service.*;
 import com.qs.serve.modules.sys.entity.SysDictData;
 import com.qs.serve.modules.sys.service.SysDictDataService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
+import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
+import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
 import com.qs.serve.modules.tbs.service.TbsBudgetService;
 import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import lombok.AllArgsConstructor;
@@ -53,6 +57,8 @@ public class BirRoiRateController {
     private BirCenterRateService birCenterRateService;
     private SysDictDataService sysDictDataService;
     private TbsCostApplyService costApplyService;
+    private BirBaseActivityMapper birBaseActivityMapper;
+    private TbsActivityMapper tbsActivityMapper;
 
 
 //    /**
@@ -89,14 +95,21 @@ public class BirRoiRateController {
     @GetMapping("/test22")
     public R<?> test22(){
         //移除当年所有
-        int year = 2023;
-        for (int i = 0; i < 12; i++) {
-            activityService.buildReport(year,i+1);
-        }
-        activityService.buildReport(2024,1);
+//        int year = 2023;
+//        for (int i = 0; i < 12; i++) {
+//            activityService.buildReport(year,i+1);
+//        }
+//        activityService.buildReport(2024,1);
+        List<Long> ids = birBaseActivityMapper.selectErrorAmtActivityCode();
+        activityService.removeErrorData(ids);
+        List<TbsActivity> activityList = tbsActivityMapper.selectBatchIds(ids);
+        List<Long> costIds = activityList.stream().map(TbsActivity::getCostApplyId).distinct().collect(Collectors.toList());
+        birActivityCenterGoodsService.rebuildBir(costIds);
         return R.ok();
     }
 
+
+
     /**
      * 台账
      * @return

src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -17,6 +18,8 @@ public interface BirBaseActivityMapper extends BaseMapper<BirBaseActivity> {
 
     List<TbsActivity> selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
 
+    List<Long> selectErrorAmtActivityCode();
+
     /**
      * 作废的异常的
      * @return

src/main/java/com/qs/serve/modules/bir/service/BirBaseActivityService.java

@@ -3,6 +3,8 @@ package com.qs.serve.modules.bir.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 
+import java.util.List;
+
 /**
  * ROI费率(活动档案) 服务接口
  * @author YenHex
@@ -17,7 +19,9 @@ public interface BirBaseActivityService extends IService<BirBaseActivity> {
      */
     void buildReport(int year, int month);
 
-
-
+    /**
+     * 修复和bir_center_good金额异常的活动
+     */
+    void removeErrorData(List<Long> actIds);
 }
 

src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java

@@ -220,9 +220,9 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
     @Override
     public void rebuildBir(List<Long> costApplyIds) {
 
-        LambdaQueryWrapper<TbsActivityCenterGoods> costLqw = new LambdaQueryWrapper<>();
-        costLqw.in(TbsActivityCenterGoods::getCostApplyId,costApplyIds);
-        List<TbsActivityCenterGoods> activityCenterGoodsAllList = tbsActivityCenterGoodsMapper.selectList(costLqw);
+        LambdaQueryWrapper<TbsActivityCenterGoods> centerGoodsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        centerGoodsLambdaQueryWrapper.in(TbsActivityCenterGoods::getCostApplyId,costApplyIds);
+        List<TbsActivityCenterGoods> activityCenterGoodsAllList = tbsActivityCenterGoodsMapper.selectList(centerGoodsLambdaQueryWrapper);
 
         if(activityCenterGoodsAllList.size()<1){
             return;
@@ -255,6 +255,11 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
         List<BmsRegion2> bizRegionList =  region2Mapper.selectList(region2Lqw);
         Map<String,BmsRegion2> bizRegionMap = bizRegionList.stream().collect(Collectors.toMap(BmsRegion2::getId,a->a));
 
+        //过滤无效的费用申请
+        LambdaQueryWrapper<TbsCostApply> costLqw = new LambdaQueryWrapper<>();
+        costLqw.in(TbsCostApply::getId,costApplyIds);
+        costLqw.eq(TbsCostApply::getCancelFlag,0);
+        costLqw.in(TbsCostApply::getChargeState,1,2,3,4);
         List<TbsCostApply> costApplyList = tbsCostApplyMapper.selectBatchIds(costApplyIds);
 
         Map<Long,List<TbsCostApply>> costApplyMap = costApplyList.stream().collect(Collectors.groupingBy(TbsCostApply::getId));
@@ -262,15 +267,20 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
         for (Long activityId : collectMap.keySet()) {
 
             TbsActivity activity = activityMapper.selectById(activityId);
+            if(activity==null||activity.getCancelFlag().equals(1)){
+                continue;
+            }
+            TbsCostApply costApply = costApplyMap.get(activity.getCostApplyId()).get(0);
+            if(costApply==null){
+                continue;
+            }
+
             //用于保存的对象列表
             List<BirActivityCenterGoods> bacgList = new ArrayList<>();
 
             //创建对象列表
             List<TbsActivityCenterGoods> activityCenterGoodsList = collectMap.get(activityId);
 
-            TbsActivityCenterGoods tempGoods = activityCenterGoodsList.get(0);
-            TbsCostApply costApply = costApplyMap.get(tempGoods.getCostApplyId()).get(0);
-
             for (TbsActivityCenterGoods activityCenterGoods : activityCenterGoodsList) {
                 LocalDate actStartDate = activityCenterGoods.getPreStartDate();
                 LocalDate actEndDate = activityCenterGoods.getPreEndDate();

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -51,6 +51,10 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
         if(activityList.size()<1){
             return;
         }
+        buildByActivityList(activityList);
+    }
+
+    private void buildByActivityList(List<TbsActivity> activityList) {
         //删除历史数据
         List<Long> ids = activityList.stream().filter(a->a.getId()!=null)
                 .map(TbsActivity::getId).collect(Collectors.toList());
@@ -192,5 +196,11 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
         this.saveBatch(birBaseActivities);
     }
 
+
+    @Override
+    public void removeErrorData(List<Long> actIds) {
+        List<TbsActivity> activityList = tbsActivityMapper.selectBatchIds(actIds);
+        this.buildByActivityList(activityList);
+    }
 }
 

src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@@ -107,7 +107,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         Integer loadType = param.getLoadType();
         String supplierId = param.getSupplierId();
         BmsSupplier supplier = bmsSupplierMapper.selectById(supplierId);
-        //TODO 最近12个月 更变为当年
+        //最近12个月
         LocalDate currMonth = LocalDate.now();
         int currMonthNum = currMonth.getYear()*100 + currMonth.getMonthValue();
         LocalDate startMonth = currMonth.plusMonths(-12);
@@ -234,7 +234,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         regionSupplierLqw.select(BmsSupplier::getId,BmsSupplier::getCode);
         List<BmsSupplier> regionSupplierList = bmsSupplierMapper.selectList(regionSupplierLqw);
         List<String> regionSupplierIds = regionSupplierList.stream().map(BmsSupplier::getId).collect(Collectors.toList());
-        regionSupplierIds.add("0");
+        regionSupplierIds.add("-999");
         //加载公司内费用
         BirRoiCostDTO costDTO4Com = new BirRoiCostDTO();
         costDTO4Com.setStartMonthNum(startMonthNum);
@@ -600,7 +600,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             if (checkNotNullVale(bmsSupplier.getRegion2Second())){
                 lqw.eq(BmsSupplier::getRegion2Second,bmsSupplier.getRegion2Second());
             }else{
-                lqw.eq(BmsSupplier::getId,"0");
+                lqw.eq(BmsSupplier::getId,"-999");
             }
         }else if(loadType.equals(3)){
             //3->客户的销售区域，省份
@@ -609,7 +609,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             }else if(checkNotNullVale(bmsSupplier.getRegionFirst())){
                 lqw.eq(BmsSupplier::getRegionFirst,bmsSupplier.getRegionFirst());
             }else {
-                lqw.eq(BmsSupplier::getId,"0");
+                lqw.eq(BmsSupplier::getId,"-999");
             }
         }else if(loadType.equals(4)){
             //4->公司维度统计
@@ -621,7 +621,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             if (checkNotNullVale(bmsSupplier.getRegion2Third())){
                 lqw.eq(BmsSupplier::getRegion2Third,bmsSupplier.getRegion2Third());
             }else{
-                lqw.eq(BmsSupplier::getId,"0");
+                lqw.eq(BmsSupplier::getId,"-999");
             }
         }
         if (loadType.equals(2)||loadType.equals(3)||loadType.equals(4)){
@@ -632,11 +632,11 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
                     .distinct().collect(Collectors.toList());
             supplierCodeList.addAll(supplierCodes);
             //防止空值
-            supplierIds.add("0");
+            supplierIds.add("-999");
             costDTO.setSupplierIds(supplierIds);
         }
         //防止空值
-        supplierCodeList.add("0");
+        supplierCodeList.add("-999");
         return supplierCodeList;
     }
 

src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java

@@ -236,16 +236,15 @@ public class PayPaymentController {
 
     /**
      * 取消不再支付
-     * @param param
+     * @param verificationCode 核销编码
      * @return
      */
     @PostMapping("/cancelUnPayment")
     @SysLog(module = SystemModule.Payment, title = "支付", biz = BizType.INSERT)
     @PreAuthorize("hasRole('pay:payment:pay')")
-    public R<PayPayment> cancelUnPayment(@RequestBody @Valid Object param){
-        //PayPayment payPayment = payPaymentService.unpayment(param);
-        //TODO cancelUnPayment;
-        return R.error();
+    public R<PayPayment> cancelUnPayment(@RequestBody String verificationCode){
+        payPaymentService.cancelUnPayment(verificationCode);
+        return R.ok();
     }
 
     /**

src/main/java/com/qs/serve/modules/pay/service/PayPaymentService.java

@@ -21,6 +21,12 @@ public interface PayPaymentService extends IService<PayPayment> {
 
     PayPayment unpayment(PayPaymentBo paymentBo);
 
+    /**
+     * 取消不在支付
+     * @param vtbCheckCode
+     */
+    void cancelUnPayment(String vtbCheckCode);
+
     /**
      * 取消支付
      * @param id

src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java

@@ -285,7 +285,12 @@ public class PayPaymentServiceImpl extends ServiceImpl<PayPaymentMapper,PayPayme
         return payPayment;
     }
 
-//    /**
+    @Override
+    public void cancelUnPayment(String verificationCode) {
+
+    }
+
+    //    /**
 //     * 构建支付明细
 //     * @param paymentBo
 //     * @param currentBalance

src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java

@@ -3,7 +3,9 @@ import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.util.HttpUtil;
 import com.qs.serve.common.util.IdUtil;
+import com.qs.serve.common.util.JsonUtil;
 import com.qs.serve.modules.sys.entity.dto.CostDeletion;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.TbsCostTodo;
@@ -113,10 +115,14 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
         tbsCostApplyRemoveMapper.tbs_cost_todo(costApplyId);
         this.saveBatch(deleteLogList);
 
-        //TODO 远程删除ERP
-        //http://59.37.164.96:9002/action/cms/cost/deletion
-
-        CostDeletion costDeletion = new CostDeletion();
+        //远程删除ERP
+        if(costApply!=null){
+            String url = "http://59.37.164.96:9002/action/cms/cost/deletion";
+            CostDeletion costDeletion = new CostDeletion();
+            costDeletion.setEmpNo(costApply.getUserCode());
+            costDeletion.setVerificationCode(costApply.getCode());
+            HttpUtil.doPost(url, JsonUtil.objectToJson(costDeletion),null);
+        }
 
     }
 

src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityCenterGoodsMapper.java

@@ -36,5 +36,29 @@ public interface TbsActivityCenterGoodsMapper extends BaseMapper<TbsActivityCent
     @InterceptorIgnore(tenantLine = "1")
     List<TbsActNotMatchAmtCenterGoods> listNotMatchAmtCenterGoods(@Param("costApplyIds") List<Long> costIds);
 
+    /**
+     * 查询错误的CenterGoodsBir记录
+     * @return
+     */
+    @Select("select bir.cost_apply_id from bir_activity_center_goods bir " +
+            " left join tbs_activity act " +
+            " on bir.activity_id = act.id " +
+            " left join tbs_cost_apply cost " +
+            " on bir.cost_apply_id = cost.id " +
+            " where act.cancel_flag = 1 or act.del_flag = 1 or cost.del_flag = 1 or cost.cancel_flag = 1")
+    List<Long> listCenterGoodsBirErrorCostId();
+
+    /**
+     * 查询错误的ActivityBir记录
+     * @return
+     */
+    @Select("select bir.cost_apply_id from bir_base_activity bir " +
+            " left join tbs_activity act " +
+            " on bir.activity_id = act.id " +
+            " left join tbs_cost_apply cost " +
+            " on bir.cost_apply_id = cost.id " +
+            " where act.cancel_flag = 1 or act.del_flag = 1 or cost.del_flag = 1 or cost.cancel_flag = 1 and bir.del_flag=0 ")
+    List<Long> listActivityBirErrorCostId();
+
 }
 

src/main/java/com/qs/serve/modules/third/entity/ThirtyVerification.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 @Setter
 public class ThirtyVerification {
 
-    private String cacc = "001";
+    private String cAcc;
 
     /**
      * 原销路通中间表 apticlaimNum
@@ -142,5 +142,30 @@ public class ThirtyVerification {
     @NotNull(message = "id不能为空")
     private String id;
 
+    /**
+     * 接口的账套转换逻辑
+     * @param bookCode
+     * @param cusCode
+     */
+    public void initBookCode(String bookCode,String cusCode){
+        if(bookCode!=null){
+            //SL也扔给锦泰
+            if (bookCode.equals("020")){
+                this.setBookCode("019");
+            }else {
+                this.setBookCode(bookCode);
+            }
+        }else {
+            if(cusCode.contains("JF")){
+                this.setBookCode("006");
+            }else if(cusCode.contains("KL")){
+                this.setBookCode("002");
+            }else if(cusCode.contains("SL")||cusCode.contains("JT")){
+                this.setBookCode("019");
+            }else {
+                this.setBookCode("001");
+            }
+        }
+    }
 
 }

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -335,7 +335,6 @@ public class PortalOfCostApplication {
 
         //构建费用申请
         TbsCostApply costApply = new TbsCostApply();
-        //2024年1月23日，添加
         costApply.setBillNumber(billNumber);
         costApply.setCode(costApplyCode);
         costApply.setChargeTheme(costTheme);
@@ -352,7 +351,6 @@ public class PortalOfCostApplication {
         costApply.setPolicyItemId(policyItem.getId());
         costApply.setPolicyItemCode(policyItem.getPolicyItemCode());
         costApply.setSubmitTime(LocalDateTime.now());
-        //2024年1月17日，添加
         costApply.setRemark(createBo.getErpCode());
         //构建活动
         TbsActivity activity = new TbsActivity();

src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java

@@ -53,6 +53,8 @@ public class ThirtyVerificationUtil {
         tv.setCheckTime(timeString);
         tv.setCusCode(supplier.getCode());
         tv.setCusName(supplier.getName());
+        tv.initBookCode(supplier.getBookCode(),supplier.getCode());
+        tv.setCAcc(tv.getBookCode());
         tv.setRecId(verification.getVerificationCode());
         String json = JsonUtil.objectToJson(tv);
         return json;
@@ -91,7 +93,8 @@ public class ThirtyVerificationUtil {
         tv.setCheckTime(timeString);
         tv.setCusCode(supplier.getCode());
         tv.setCusName(supplier.getName());
-        tv.setBookCode(supplier.getBookCode());
+        tv.initBookCode(supplier.getBookCode(),supplier.getCode());
+        tv.setCAcc(tv.getBookCode());
         tv.setRecId(verification.getVerificationCode());
         return JsonUtil.objectToJson(tv);
     }

src/main/java/com/qs/serve/modules/tzc/mapper/TzcPolicyItemMapper.java

@@ -21,7 +21,7 @@ public interface TzcPolicyItemMapper extends BaseMapper<TzcPolicyItem> {
      * @return
      */
     @InterceptorIgnore(tenantLine = "true")
-    @Select("select COALESCE(sum(amount),0) from tbs_budget_log where create_policy_item_id = #{policyItemId} and opt_type = '13'")
+    @Select("select COALESCE(sum(amount),0) from tbs_budget_log where create_policy_item_id = #{policyItemId} and opt_type = '13' and del_flag = 0")
     BigDecimal sumPolicyItemTranAmt(@Param("policyItemId")Long policyItemId);
 
 }

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.vtb.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.config.properties.ProjectApisProperties;
 import com.qs.serve.common.model.annotation.LimitSubmit;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.PageVo;
@@ -15,6 +16,7 @@ import com.qs.serve.modules.seeyon.entity.dto.CtpAffairPageSo;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.entity.dto.CostDeletion;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserService;
@@ -58,6 +60,7 @@ import java.util.stream.Collectors;
 @RequestMapping("vtb/verification")
 public class VtbVerificationController {
 
+    private ProjectApisProperties projectApisProperties;
     private VtbVerificationService vtbVerificationService;
     private VtbVerificationMapper vtbVerificationMapper;
     private VtbVerificationChannelService vtbVerificationChannelService;
@@ -489,6 +492,9 @@ public class VtbVerificationController {
      */
     @GetMapping("/toPayRequest")
     public R<?> toPayRequest(Long verificationId,Integer fullState){
+        //预先调用伟成同步状态接口，减少查询记录数
+        String url = projectApisProperties.getCheckPayStatus();
+        HttpUtil.doGet(url,null);
         if(fullState!=null&&fullState.equals(1)){
             List<Long> vids = vtbVerificationMapper.listNotPayVerifyIds();
             for (Long vid : vids) {
@@ -501,6 +507,20 @@ public class VtbVerificationController {
     }
 
 
+//    @GetMapping("delCaPay")
+//    public R<?> delCaPay(){
+//        String url = "http://59.37.164.96:2506/action/cms/cost/deletion";
+//        Set<String> codes = new HashSet<>(vtbVerificationMapper.listCaVerificationCode());
+//        for (String code : codes) {
+//            CostDeletion costDeletion = new CostDeletion();
+//            costDeletion.setEmpNo("yuangong");
+//            costDeletion.setVerificationCode(code);
+//            HttpUtil.doPost(url, JsonUtil.objectToJson(costDeletion),null);
+//            log.debug("del :{} ",code);
+//        }
+//        return R.ok();
+//    }
+
     /**
      * 成功提交回调
      * @param verificationId

src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java

@@ -18,6 +18,12 @@ import java.util.List;
  */
 public interface VtbVerificationMapper extends BaseMapper<VtbVerification> {
 
+    @InterceptorIgnore(tenantLine = "true")
+    @Select("SELECT verification_code FROM `vtb_verification`" +
+            " where verification_code like 'HX%'" +
+            " and LENGTH(verification_code)>12 ")
+    List<String> listCaVerificationCode();
+
     @InterceptorIgnore(tenantLine = "true")
     @Select("select v.id from vtb_verification v " +
             "left join tbs_cost_apply t " +
@@ -35,6 +41,8 @@ public interface VtbVerificationMapper extends BaseMapper<VtbVerification> {
             "and v.user_id <> '0' " +
             //排除CA的单子
             "and length(v.verification_code)<18 "+
+            //部分金额为0忽略
+            " and v.amount != 0 "+
             "ORDER BY v.id asc")
     List<Long> listNotPayVerifyIds();
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -371,7 +371,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             Assert.throwEx("当前活动状态不可作废");
         }
 
-        String host = "http://59.37.164.96:9002/action/cms/cost/deletion";
+        String host = "http://59.37.164.96:2506/action/cms/cost/deletion";
 
         //TODO 请求伟成接口，删除 XLT_BIFyDbf
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());

src/main/java/com/qs/serve/task/BirTask.java

@@ -26,6 +26,9 @@ public class BirTask {
     @Scheduled(cron="0 0 1 * * ?")
     public void buildTempTable(){
         AuthContextUtils.setTenant("001");
+        //移除取消的和删除的费用ID
+
+
         int year = LocalDate.now().getYear();
         for (int i = 1;i < 13; i++) {
             birActivityCenterGoodsService.buildReport(year,i);

src/main/resources/mapper/bir/BirBaseActivityMapper.xml

@@ -116,5 +116,20 @@
         set bir_base_activity.del_flag = '1'
         where charge_state not in (2,3)
     </select>
+    <select id="selectErrorAmtActivityCode" resultType="java.lang.Long">
+        select
+            t1.activity_id
+        from (
+                 select bir_activity_center_goods.activity_id ,SUM(split_amount) as split_amt
+                 from bir_activity_center_goods
+                 where bir_activity_center_goods.act_start_date>'2023-06-01'
+                 GROUP BY bir_activity_center_goods.activity_id
+             ) t1 left join tbs_activity on tbs_activity.id = t1.activity_id
+        where
+            1=1
+          and t1.split_amt != tbs_activity.total_amount
+        order by t1.activity_id
+    </select>
+
 
 </mapper>