|
|
@@ -3,8 +3,8 @@ package com.cyksj.web.controller.manage.distribute;
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
-import cn.hutool.core.date.BetweenFormater;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.date.BetweenFormater;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
@@ -16,6 +16,7 @@ import com.cyksj.common.util.StringUtil;
|
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.BusinessType;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
+import com.cyksj.mapper.DistributeGoodsSkuAlertMapper;
|
|
|
import com.cyksj.mapper.GoodsDonMapper;
|
|
|
import com.cyksj.mapper.GoodsDonSkuMapper;
|
|
|
import com.cyksj.mapper.UserMapper;
|
|
|
@@ -102,6 +103,8 @@ public class DistributeController {
|
|
|
|
|
|
private final RedisService redisService;
|
|
|
|
|
|
+ private final DistributeGoodsSkuAlertMapper distributeGoodsSkuAlertMapper;
|
|
|
+
|
|
|
private final UserDistributeRuleOrderRecordMapper userDistributeRuleOrderRecordMapper;
|
|
|
|
|
|
/**
|
|
|
@@ -558,6 +561,11 @@ public class DistributeController {
|
|
|
if (businessRate.getId() == null) {
|
|
|
try {
|
|
|
userDistributeBusinessRateMapper.insert(businessRate);
|
|
|
+
|
|
|
+ //删除存在告警的平台规格
|
|
|
+ distributeGoodsSkuAlertMapper.delete(Wrappers.lambdaQuery(DistributeGoodsSkuAlert.class)
|
|
|
+ .in(DistributeGoodsSkuAlert::getSkuId, businessRate.getSkuId()));
|
|
|
+
|
|
|
} catch (DuplicateKeyException e) {
|
|
|
}
|
|
|
} else {
|
|
|
@@ -655,7 +663,14 @@ public class DistributeController {
|
|
|
userPlatDistributeRate.setSecondRate(secondRate);
|
|
|
save.add(userPlatDistributeRate);
|
|
|
});
|
|
|
- Lists.partition(save, 100).forEach(part -> userDistributeBusinessRateMapper.batchInsertDistributePlatRate(part));
|
|
|
+ Lists.partition(save, 100).forEach(part -> {
|
|
|
+ List<Long> goodsIds = part.stream().map(UserPlatDistributeRate::getGoodsId).collect(Collectors.toList());
|
|
|
+ //删除存在告警的平台
|
|
|
+ distributeGoodsSkuAlertMapper.delete(Wrappers.lambdaQuery(DistributeGoodsSkuAlert.class)
|
|
|
+ .in(DistributeGoodsSkuAlert::getGoodsId, goodsIds));
|
|
|
+
|
|
|
+ userDistributeBusinessRateMapper.batchInsertDistributePlatRate(part);
|
|
|
+ });
|
|
|
}
|
|
|
businessDefaultRateConfigMapper.updateById(config);
|
|
|
});
|
|
|
@@ -903,4 +918,13 @@ public class DistributeController {
|
|
|
List<BusinessDistributesMonthlyDataView> collect = businessDistributesDataViews.stream().sorted(Comparator.comparing(BusinessDistributesMonthlyDataView::getBusinessId).thenComparing(BusinessDistributesMonthlyDataView::getType)).collect(Collectors.toList());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(collect);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 是否有未配置比例的规格
|
|
|
+ */
|
|
|
+ @GetMapping("/get/goodsSku/alert")
|
|
|
+ public Result<Boolean> getGoodsSkuAlert() {
|
|
|
+ Integer count = distributeGoodsSkuAlertMapper.selectCountByCondition();
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().toResult(count > 0 ? true : false);
|
|
|
+ }
|
|
|
}
|