|
|
@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import cn.hutool.json.JSONUtil; |
|
|
|
import cn.hutool.json.JSONUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.logpm.factory.comfac.dto.OrderStatusDTO; |
|
|
|
import com.logpm.factory.comfac.dto.OrderStatusDTO; |
|
|
@ -132,7 +131,7 @@ public class FactoryXxlJob { |
|
|
|
|
|
|
|
|
|
|
|
// 查询所有的数据库内容 只包含客户单号
|
|
|
|
// 查询所有的数据库内容 只包含客户单号
|
|
|
|
List<StationOrderEntity> allDataList = stationOrderService.list(); |
|
|
|
List<StationOrderEntity> allDataList = stationOrderService.list(); |
|
|
|
XxlJobLogger.log("allDataList{}", allDataList.size()); |
|
|
|
XxlJobLogger.log("allDataList {}", allDataList.size()); |
|
|
|
// 解析数据
|
|
|
|
// 解析数据
|
|
|
|
ls.forEach(orderLogEntity -> { |
|
|
|
ls.forEach(orderLogEntity -> { |
|
|
|
|
|
|
|
|
|
|
@ -220,7 +219,7 @@ public class FactoryXxlJob { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public Boolean resoveFactoryData() { |
|
|
|
public void resoveFactoryData() { |
|
|
|
Map<Long, List<StaorderPackagesEntity>> map = new HashMap<>(); |
|
|
|
Map<Long, List<StaorderPackagesEntity>> map = new HashMap<>(); |
|
|
|
//TODO 调用Service 获取需要处理的数据
|
|
|
|
//TODO 调用Service 获取需要处理的数据
|
|
|
|
//查询要处理的订单信息
|
|
|
|
//查询要处理的订单信息
|
|
|
@ -416,7 +415,6 @@ public class FactoryXxlJob { |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return true; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|