Browse Source

opt: 修改bir数据源

checkBack
Yen 1 year ago
parent
commit
427306b5fd
  1. 9
      pom.xml
  2. 41
      src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
  3. 13
      src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java
  4. 26
      src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java
  5. 15
      src/main/java/com/qs/serve/modules/bir/service/BirActivityCenterGoodsService.java
  6. 13
      src/main/java/com/qs/serve/modules/bir/service/BirBaseActivityService.java
  7. 173
      src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
  8. 43
      src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
  9. 45
      src/main/java/com/qs/serve/task/BirTask.java
  10. 41
      src/main/java/com/qs/serve/task/controller/TaskActivityController.java
  11. 8
      src/main/resources/mapper/bir/BirBaseActivityMapper.xml

9
pom.xml

@ -141,6 +141,11 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
@ -153,11 +158,11 @@
<version>8.0.15</version>
</dependency>
<!--<dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.4.1.jre8</version>
</dependency>-->
</dependency>
<dependency>
<groupId>org.springframework</groupId>

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

@ -195,46 +195,5 @@ public class BirRoiRateController {
}
/**
* 重新指定费用申请生成bir
* @return
*/
@GetMapping("/rebuildBir")
public R<?> rebuildBir(){
//select count(1) from tbs_cost_apply where create_time >= '2023-03-01' and create_time < '2023-04-01'
// LocalDate startTime = LocalDate.of(2023,7,1);
// LocalDate endTime = LocalDate.of(2023,12,1);
// LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>();
// lqw.select(TbsCostApply::getId);
// lqw.gt(TbsCostApply::getCreateTime,startTime);
// lqw.le(TbsCostApply::getCreateTime,endTime);
// lqw.in(TbsCostApply::getChargeState,2,3);
// List<TbsCostApply> costApplyList = costApplyService.list(lqw);
// List<Long> costIds = costApplyList.stream().map(a->a.getId()).distinct().collect(Collectors.toList());
// birActivityCenterGoodsService.rebuildBir(costIds);
// Long[] costIds = new Long[]{
// 6234L
// };
//更新CA
LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>();
lqw.select(TbsCostApply::getId);
lqw.likeRight(TbsCostApply::getCode,"CA");
List<TbsCostApply> costApplyList = costApplyService.list(lqw);
List<Long> costIds = costApplyList.stream().map(TbsCostApply::getId).distinct().collect(Collectors.toList());
birActivityCenterGoodsService.rebuildBir(costIds);
List<TbsActivity> activityList = tbsActivityMapper.selectList(
new LambdaQueryWrapper<TbsActivity>().likeRight(TbsActivity::getActivityCode,"CA")
.select(TbsActivity::getId)
);
List<Long> actIds = activityList.stream().map(TbsActivity::getId).collect(Collectors.toList());
activityService.removeErrorData(actIds);
return R.ok();
}
}

13
src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java

@ -1,5 +1,6 @@
package com.qs.serve.modules.bir.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
@ -18,9 +19,10 @@ import java.util.List;
* @author YenHex
* @date 2023-07-06
*/
@DS("erp_stand_ds")
public interface BirActivityCenterGoodsMapper extends BaseMapper<BirActivityCenterGoods> {
List<BirActivityCenterGoods> selectErrorBir();
//List<BirActivityCenterGoods> selectErrorBir();
@InterceptorIgnore(tenantLine = "true")
BigDecimal totalAmt(@Param("startDate") Integer startDate,
@ -28,15 +30,10 @@ public interface BirActivityCenterGoodsMapper extends BaseMapper<BirActivityCent
/**
* 查询出异动的记录
* @param startDate
* @param endDate
* @return
*/
List<TbsActivityCenterGoods> selectChangeCenterGoods(@Param("startDate") LocalDate startDate,
@Param("endDate")LocalDate endDate,
@Param("costApplyId")Long costApplyId);
//List<TbsActivityCenterGoods> selectChangeCenterGoods(@Param("startDate") LocalDate startDate,@Param("endDate")LocalDate endDate,@Param("costApplyId")Long costApplyId);
List<BirActivityCenterGoods> selectNoExistCenterGoods();
//List<BirActivityCenterGoods> selectNoExistCenterGoods();
List<BirActivityCenterGoodsMonthVo> listMonthCusCenterVo(@Param("query") BirMonthCusCenterSo param);

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

@ -1,5 +1,6 @@
package com.qs.serve.modules.bir.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qs.serve.modules.bir.entity.BirBaseActivity;
@ -16,31 +17,12 @@ import java.util.List;
* @author YenHex
* @date 2023-06-05
*/
@DS("erp_stand_ds")
public interface BirBaseActivityMapper extends BaseMapper<BirBaseActivity> {
List<TbsActivity> selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
List<Long> selectErrorAmtActivityCode();
/**
* 作废的异常的
* @return
*/
void deleteErrorBir();
/**
* 查询错误的ActivityBir记录
* @return
*/
@Select("update 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 " +
" set bir.del_flag = 1 " +
" 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 ")
Integer removeActivityBirError();
//List<TbsActivity> selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
//List<Long> selectErrorAmtActivityCode();
@InterceptorIgnore(tenantLine = "true")
@Select("select " +

15
src/main/java/com/qs/serve/modules/bir/service/BirActivityCenterGoodsService.java

@ -15,21 +15,6 @@ import java.util.List;
*/
public interface BirActivityCenterGoodsService extends IService<BirActivityCenterGoods> {
/**
* 创建分割统计表
* @param year
* @param month
*/
void buildReport(int year, int month);
/**
* 查询客户维度
* @param param
* @return
*/
List<BirActivityCenterGoodsMonthVo> listMonthCusCenterVo(BirMonthCusCenterSo param);
void rebuildBir(List<Long> costApplyId);
}

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

@ -12,18 +12,7 @@ import java.util.List;
*/
public interface BirBaseActivityService extends IService<BirBaseActivity> {
/**
* 创建分割统计表
* @param year
* @param month
*/
void buildReport(int year, int month);
/**
* 修复和bir_center_good金额异常的活动
*/
void removeErrorData(List<Long> actIds);
void flushByCostId(Long costId);
/**
* 更新bir活动的金额

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

@ -15,6 +15,7 @@ import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo;
import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo;
import com.qs.serve.modules.bir.mapper.BirBaseActivityMapper;
import com.qs.serve.modules.bir.mapper.BirRemoveIdMapper;
import com.qs.serve.modules.bir.service.BirBaseActivityService;
import com.qs.serve.modules.bir.service.BirRemoveIdService;
import com.qs.serve.modules.bms.entity.BmsCostCenter;
import com.qs.serve.modules.bms.entity.BmsRegion;
@ -66,162 +67,30 @@ import java.util.stream.Collectors;
@AllArgsConstructor
public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCenterGoodsMapper,BirActivityCenterGoods> implements BirActivityCenterGoodsService {
private final TbsActivityCenterGoodsService centerGoodsService;
private final BmsCostCenterMapper costCenterMapper;
private final BmsRegionMapper regionMapper;
private final BmsRegion2Mapper region2Mapper;
private final VtbFundFlowMapper fundFlowMapper;
private final TbsActivityMapper activityMapper;
private final TbsActivityCenterGoodsMapper tbsActivityCenterGoodsMapper;
private final BirBaseActivityMapper birBaseActivityMapper;
private final BmsSupplierMapper bmsSupplierMapper;
//private final BirRemoveIdMapper birRemoveIdMapper;
private final BirRemoveIdService birRemoveIdService;
private final TbsCostApplyMapper tbsCostApplyMapper;
@Override
public void buildReport(int year, int month) {
LocalDate startDate = LocalDate.of(year,month,1);
int lastDayNum2 = startDate.lengthOfMonth();
LocalDate endDate = LocalDate.of(year,month,lastDayNum2);
//加载所有异动的数据
List<TbsActivityCenterGoods> activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
//异常状态的费用申请,导致的Bir
birBaseActivityMapper.deleteErrorBir();
birBaseActivityMapper.removeActivityBirError();
List<BirActivityCenterGoods> removeErrorBirList = this.baseMapper.selectErrorBir();
List<Long> errorActIds = removeErrorBirList.stream().map(BirActivityCenterGoods::getActivityId).distinct().collect(Collectors.toList());
this.buildRemoveRecode(errorActIds);
if(activityCenterGoodsAllList.size()<1){
return;
}
//添加支持:活动明细删除了,在bir_activity_center_goods还存在
// 删除历史数据
List<Long> activityIds = activityCenterGoodsAllList.stream().filter(a->a.getId()!=null)
.map(TbsActivityCenterGoods::getActivityId).collect(Collectors.toList());
this.buildRemoveRecode(activityIds);
List<BirActivityCenterGoods> noExist = this.baseMapper.selectNoExistCenterGoods();
if(noExist.size()>0){
List<BirRemoveId> removeIds = noExist.stream().map(a-> {
BirRemoveId birRemoveId = new BirRemoveId();
birRemoveId.setDeleteTime(LocalDateTime.now());
birRemoveId.setId(a.getId());
return birRemoveId;
}).collect(Collectors.toList());
birRemoveIdService.saveBatch(removeIds);
}
this.removeBatchByIds(noExist);
activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(startDate,endDate,null);
// activityCenterGoodsAllList = this.baseMapper.selectChangeCenterGoods(null,null,15840L);
if(activityCenterGoodsAllList.size()<1){
return;
}
//加载所有自定义成本中心
List<BmsCostCenter> costCenterList = costCenterMapper.selectList(new QueryWrapper<>());
// 按活动id分组
Map<Long,List<TbsActivityCenterGoods>> collectMap = activityCenterGoodsAllList.stream()
.collect(Collectors.groupingBy(TbsActivityCenterGoods::getActivityId));
List<Long> costApplyIds = activityCenterGoodsAllList.stream().map(a->a.getCostApplyId()).distinct().collect(Collectors.toList());
LambdaQueryWrapper<BmsSupplier> supplierLqw = new LambdaQueryWrapper<>();
supplierLqw.in(BmsSupplier::getId,activityCenterGoodsAllList.stream().map(a->a.getSupplierId()).distinct().collect(Collectors.toList()));
List<BmsSupplier> bmsSupplierList = bmsSupplierMapper.selectList(supplierLqw);
Map<String,BmsSupplier> supplierMap = bmsSupplierList.stream().collect(Collectors.toMap(BmsSupplier::getId,a->a));
LambdaQueryWrapper<BmsRegion> regionLqw = new LambdaQueryWrapper<>();
regionLqw.in(BmsRegion::getId,bmsSupplierList.stream().map(a->a.getRegionLast()).collect(Collectors.toList()));
List<BmsRegion> saleRegionList = regionMapper.selectList(regionLqw);
Map<String,BmsRegion> saleRegionMap = saleRegionList.stream().collect(Collectors.toMap(BmsRegion::getId,a->a));
LambdaQueryWrapper<BmsRegion2> region2Lqw = new LambdaQueryWrapper<>();
region2Lqw.in(BmsRegion2::getId,bmsSupplierList.stream().map(a->a.getRegion2Last()).collect(Collectors.toList()));
List<BmsRegion2> bizRegionList = region2Mapper.selectList(region2Lqw);
Map<String,BmsRegion2> bizRegionMap = bizRegionList.stream().collect(Collectors.toMap(BmsRegion2::getId,a->a));
// TODO查询费用释放
// VtbFundFlow flow = new VtbFundFlow();
// flow.setFundType(VtbFundFlowType.Release);
// flow.setSelectActivityIds(new ArrayList<>(collectMap.keySet()));
// List<VtbFundFlowSumAmtDTO> actReleaseList = fundFlowMapper.listSumAmount(flow);
// final Map<Long,BigDecimal> actReleaseMap = new HashMap<>();
// actReleaseList.forEach(actRelease -> actReleaseMap.put(actRelease.getActivityId(),actRelease.getTotalAmt()));
List<TbsCostApply> costApplyList = tbsCostApplyMapper.selectBatchIds(costApplyIds);
Map<Long,List<TbsCostApply>> costApplyMap = costApplyList.stream().collect(Collectors.groupingBy(TbsCostApply::getId));
for (Long activityId : collectMap.keySet()) {
TbsActivity activity = activityMapper.selectById(activityId);
//用于保存的对象列表
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();
int currentActDays = (int) (actEndDate.toEpochDay()-actStartDate.toEpochDay()+1);
List<DateSplitDTO> dateSplitList = DateSplitUtil.getSplitDto(actStartDate,actEndDate);
if(dateSplitList.size()>1){
for (DateSplitDTO currDateSplit : dateSplitList) {
//获取该项分割金额对象
BirCenterGoodSplitDTO goodSplitDTO = this.buildSplitAmount(activity,activityCenterGoods,
dateSplitList, currDateSplit,currentActDays);
//创建底表对象
BirActivityCenterGoods entity = createBirActivityCenterGoodsEntity(costCenterList,
activityCenterGoods, currentActDays, currDateSplit, goodSplitDTO,supplierMap,saleRegionMap,bizRegionMap,costApply);
bacgList.add(entity);
}
}else if (dateSplitList.size()==1){
DateSplitDTO currDateSplit = dateSplitList.get(0);
//获取该项分割金额对象
BirCenterGoodSplitDTO goodSplitDTO = this.buildSplitAmount(activity,activityCenterGoods,
dateSplitList, currDateSplit,currentActDays);
//创建底表对象
BirActivityCenterGoods entity = createBirActivityCenterGoodsEntity(costCenterList,
activityCenterGoods, currentActDays, currDateSplit, goodSplitDTO,supplierMap,saleRegionMap,bizRegionMap,costApply);
bacgList.add(entity);
}
}
if(bacgList.size()>0){
this.saveBatch(bacgList);
}
}
}
private final BirBaseActivityService birBaseActivityService;
@Override
public void rebuildBir(List<Long> costApplyIds) {
//刷新BirBaseActivity
for (Long costApplyId : costApplyIds) {
birBaseActivityService.flushByCostId(costApplyId);
}
LambdaQueryWrapper<TbsActivityCenterGoods> centerGoodsLambdaQueryWrapper = new LambdaQueryWrapper<>();
centerGoodsLambdaQueryWrapper.in(TbsActivityCenterGoods::getCostApplyId,costApplyIds);
List<TbsActivityCenterGoods> activityCenterGoodsAllList = tbsActivityCenterGoodsMapper.selectList(centerGoodsLambdaQueryWrapper);
@ -229,10 +98,6 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
if(activityCenterGoodsAllList.size()<1){
return;
}
// 删除历史数据
List<Long> activityIds = activityCenterGoodsAllList.stream().filter(a->a.getId()!=null)
.map(TbsActivityCenterGoods::getActivityId).collect(Collectors.toList());
this.buildRemoveRecode(activityIds);
//加载所有自定义成本中心
List<BmsCostCenter> costCenterList = costCenterMapper.selectList(new QueryWrapper<>());
@ -316,26 +181,6 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
}
private void buildRemoveRecode(List<Long> activityIds) {
if(CollectionUtil.isNotEmpty(activityIds)) {
LambdaQueryWrapper<BirActivityCenterGoods> birBaseActivityLqw = new LambdaQueryWrapper<>();
birBaseActivityLqw.in(BirActivityCenterGoods::getActivityId, activityIds);
List<BirActivityCenterGoods> removeBirList = this.list(birBaseActivityLqw);
if (removeBirList.size() > 0) {
List<BirRemoveId> removeIds = removeBirList.stream().map(a -> {
BirRemoveId birRemoveId = new BirRemoveId();
birRemoveId.setDeleteTime(LocalDateTime.now());
birRemoveId.setId(a.getId());
return birRemoveId;
}).collect(Collectors.toList());
birRemoveIdService.saveBatch(removeIds);
}
this.remove(birBaseActivityLqw);
}
}
/**
* 创建底表对象
* @param costCenterList
@ -570,10 +415,6 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
return goodSplitDTO;
}
@Override
public List<BirActivityCenterGoodsMonthVo> listMonthCusCenterVo(BirMonthCusCenterSo param) {
return baseMapper.listMonthCusCenterVo(param);
}
}

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

@ -12,6 +12,7 @@ import com.qs.serve.modules.tbs.entity.TbsActivity;
import com.qs.serve.modules.tbs.entity.TbsCostApply;
import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
import com.qs.serve.modules.tbs.service.TbsActivityService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -40,23 +41,12 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
private final TbsCostApplyMapper costApplyMapper;
private final TbsActivityMapper tbsActivityMapper;
private final TbsActivityService tbsActivityService;
@Override
public void buildReport(int year, int month) {
String monthStr = month<10?"0"+month:month+"";
int yearMonth = Integer.parseInt(year+""+monthStr);
LocalDate startDate = LocalDate.of(year,month,1);
int lastDayNum2 = startDate.lengthOfMonth();
LocalDate endDate = LocalDate.of(year,month,lastDayNum2);
//修改为增量
List<TbsActivity> activityList = baseMapper.selectByBirActivity(startDate,endDate);
if(activityList.size()<1){
return;
}
buildByActivityList(activityList);
}
private void buildByActivityList(List<TbsActivity> activityList) {
public void flushByCostId(Long costId) {
TbsCostApply costApply = costApplyMapper.selectById(costId);
List<TbsActivity> activityList = tbsActivityService.listByCostApplyId(costId);
//删除历史数据
List<Long> ids = activityList.stream().filter(a->a.getId()!=null)
.map(TbsActivity::getId).collect(Collectors.toList());
@ -64,24 +54,12 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
birBaseActivityLqw.in(BirBaseActivity::getActivityId,ids);
this.remove(birBaseActivityLqw);
List<Long> costIds = activityList.stream().map(a->a.getCostApplyId()).distinct().collect(Collectors.toList());
LambdaQueryWrapper<TbsCostApply> costApplyLqw = new LambdaQueryWrapper<>();
costApplyLqw.in(TbsCostApply::getId,costIds);
List<TbsCostApply> costApplyList = costApplyMapper.selectList(costApplyLqw);
LambdaQueryWrapper<TbsActivity> activityLqw = new LambdaQueryWrapper<>();
activityLqw.in(TbsActivity::getId,ids);
activityList = tbsActivityMapper.selectList(activityLqw);
List<BirBaseActivity> birBaseActivities = new ArrayList<>();
for (TbsActivity activity : activityList) {
TbsCostApply costApply = costApplyList.stream().filter(a->a.getId().equals(activity.getCostApplyId())).findFirst().get();
if(costApply==null){
continue;
}
LocalDate actStartDate = activity.getPreStartDate();
LocalDate actEndDate = activity.getPreEndDate();
int currentActDays = (int) (actEndDate.toEpochDay()-actStartDate.toEpochDay()+1);
@ -94,9 +72,9 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
BirBaseActivity baseActivity = new BirBaseActivity();
//活动金额
BigDecimal currentAmount = BigDecimal.ZERO;
BigDecimal currentAmount;
//核销金额
BigDecimal currentCheckAmount = BigDecimal.ZERO;
BigDecimal currentCheckAmount;
//支付金额
BigDecimal currentPayAmount = BigDecimal.ZERO;
@ -198,13 +176,6 @@ 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);
}
@Override
public void compareAmtToUpdateActivityAmt() {
List<UnMatchBirRecord> matchBirRecords = baseMapper.selectUnMatchBir();

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

@ -1,45 +0,0 @@
package com.qs.serve.task;
import com.qs.serve.common.util.AuthContextUtils;
import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService;
import com.qs.serve.modules.bir.service.BirBaseActivityService;
import com.qs.serve.task.controller.TaskActivityController;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
/**
* @author YenHex
* @since 2023/7/14
*/
@Slf4j
@Component
@AllArgsConstructor
@ConditionalOnProperty(value = "project.task", havingValue = "true")
public class BirTask {
private final BirBaseActivityService activityService;
private final BirActivityCenterGoodsService birActivityCenterGoodsService;
@Scheduled(cron="0 0 1 * * ?")
public void buildTempTable(){
AuthContextUtils.setTenant("001");
//移除取消的和删除的费用ID
birActivityCenterGoodsService.buildReport(2023,12);
birActivityCenterGoodsService.buildReport(2024,1);
birActivityCenterGoodsService.buildReport(2024,2);
birActivityCenterGoodsService.buildReport(2024,3);
birActivityCenterGoodsService.buildReport(2024,4);
activityService.buildReport(2023,12);
activityService.buildReport(2024,1);
activityService.buildReport(2024,2);
activityService.buildReport(2024,3);
activityService.buildReport(2024,4);
}
}

41
src/main/java/com/qs/serve/task/controller/TaskActivityController.java

@ -44,20 +44,6 @@ public class TaskActivityController {
private final SeeYonRequestBaseService seeYonRequestBaseService;
/**
* 同步活动底表ActivityCenterGoods
* @param month
* @return
*/
@GetMapping("syncActivityCenterGoods")
public R taskBir(Integer month){
//移除取消的和删除的费用ID
for (int i = 1;i < 13; i++) {
birActivityCenterGoodsService.buildReport(2023,i);
birActivityCenterGoodsService.buildReport(2024,i);
}
return R.ok();
}
/**
* 同步ERP的发货单用于计算活动费率
@ -69,27 +55,6 @@ public class TaskActivityController {
return R.ok();
}
/**
* 同步费率底表记录
* @param month 月份不指定当前月
* @param year 年份不指定当前年
* @return
*/
@GetMapping("birActivity")
public R task1(Integer year,Integer month){
//移除当年所有
if(year==null){
year = LocalDate.now().getYear();
}
if(month==null){
month = LocalDate.now().getMonthValue();
syncYearMonthActivity(month, year);
}else {
syncYearMonthActivity(month, year);
}
return R.ok();
}
/**
* 每日更新过期的活动过期则进行冻结
* @return
@ -135,10 +100,4 @@ public class TaskActivityController {
return R.ok();
}
private void syncYearMonthActivity(Integer month, Integer year) {
birBaseActivityService.buildReport(year, month);
}
}

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

@ -109,14 +109,6 @@
)
</select>
<select id="deleteErrorBir" >
update bir_base_activity
left join tbs_cost_apply
on tbs_cost_apply.id = bir_base_activity.cost_apply_id
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

Loading…
Cancel
Save