|
|
|
@ -12,11 +12,13 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import com.baiye.config.properties.DeliveryProperties;
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
|
import com.baiye.constant.FileConstant;
|
|
|
|
|
import com.baiye.model.dto.UserDto;
|
|
|
|
|
import com.baiye.modules.platform.domain.Company;
|
|
|
|
|
import com.baiye.modules.platform.domain.TaskImei;
|
|
|
|
|
import com.baiye.modules.platform.service.*;
|
|
|
|
|
import com.baiye.modules.platform.service.dto.ImeiDTO;
|
|
|
|
|
import com.baiye.modules.platform.service.dto.TaskTagDto;
|
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
|
|
import com.baiye.util.*;
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
@ -45,11 +47,12 @@ public class DeliveryBalanceTask {
|
|
|
|
|
|
|
|
|
|
private final TaskService taskService;
|
|
|
|
|
|
|
|
|
|
private final UserService userService;
|
|
|
|
|
|
|
|
|
|
private final CompanyService companyService;
|
|
|
|
|
|
|
|
|
|
private final TaskImeiService taskImeiService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final DownRecordService downRecordService;
|
|
|
|
|
|
|
|
|
|
private final DeliveryProperties deliveryProperties;
|
|
|
|
@ -75,9 +78,12 @@ public class DeliveryBalanceTask {
|
|
|
|
|
log.info("=================== the task Id as {},upload size as {} ====================", taskId, list.size());
|
|
|
|
|
Long userId = list.get(DefaultNumberConstants.ZERO_NUMBER).getUserId();
|
|
|
|
|
Company companyByUserId = companyService.findCompanyByUserId(userId);
|
|
|
|
|
if (ObjectUtil.isNotNull(companyByUserId) &&
|
|
|
|
|
UserDto userInfo = userService.findUserInfo(userId);
|
|
|
|
|
if (ObjectUtil.isNotNull(userInfo)
|
|
|
|
|
&& Boolean.TRUE.equals(userInfo.getEnabled())
|
|
|
|
|
&& ObjectUtil.isNotNull(companyByUserId)
|
|
|
|
|
// 判断价格
|
|
|
|
|
ObjectUtil.isNotNull(companyByUserId.getDmpDeliveryFee())) {
|
|
|
|
|
&& ObjectUtil.isNotNull(companyByUserId.getDmpDeliveryFee())) {
|
|
|
|
|
Integer dmpLimitNum = companyByUserId.getDmpLimitNum();
|
|
|
|
|
// 判断余额
|
|
|
|
|
if (ObjectUtil.isNull(companyByUserId.getUserBalance())
|
|
|
|
|