|
|
|
@ -57,11 +57,12 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
|
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
@Async |
|
|
|
|
public void handlerPanDataToHt() { |
|
|
|
|
public void handlerPanDataToHt(Long id) { |
|
|
|
|
log.info("################handlerDataToHt: 处理皮阿诺订单数据到"); |
|
|
|
|
//查询需要同步的订单
|
|
|
|
|
QueryWrapper<PanFactoryOrder> orderQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
orderQueryWrapper.eq("status",1) |
|
|
|
|
.eq("id",id) |
|
|
|
|
.eq("is_deleted",0); |
|
|
|
|
List<PanFactoryOrder> panFactoryOrders = panFactoryOrderService.list(orderQueryWrapper); |
|
|
|
|
List<ServiceNumEntity> serviceNumEntityList = new ArrayList<>(); |
|
|
|
@ -69,9 +70,12 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
|
|
|
|
|
for (PanFactoryOrder panFactoryOrder:panFactoryOrders){ |
|
|
|
|
Long orderId = panFactoryOrder.getId(); |
|
|
|
|
log.info("#########handlerDataToHt: 当前处理的订单id={}",orderId); |
|
|
|
|
|
|
|
|
|
String orderNo = panFactoryOrder.getOrderNo();//订单自编码
|
|
|
|
|
AdvanceEntity advanceEntity = iAdvanceClient.getQueryDataOne(orderNo); |
|
|
|
|
Integer advanceId = null; |
|
|
|
|
if(Objects.isNull(advanceEntity)){ |
|
|
|
|
//添加订单信息
|
|
|
|
|
AdvanceEntity advanceEntity = new AdvanceEntity(); |
|
|
|
|
advanceEntity = new AdvanceEntity(); |
|
|
|
|
advanceEntity.setOrderSelfNum(StringUtil.isBlank(panFactoryOrder.getOrderNo())?"":panFactoryOrder.getOrderNo()); //订单自编号
|
|
|
|
|
advanceEntity.setSiteName(PanFactoryEnum.getMes(panFactoryOrder.getPlantId())); // 基地
|
|
|
|
|
advanceEntity.setArea(StringUtil.isBlank(panFactoryOrder.getReceiverArea())?"":panFactoryOrder.getReceiverArea()); // 区域
|
|
|
|
@ -93,8 +97,8 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
|
|
|
|
|
advanceEntity.setCustomerPhone(StringUtil.isBlank(panFactoryOrder.getCustomerNumber())?"":panFactoryOrder.getCustomerNumber()); // 顾客电话
|
|
|
|
|
advanceEntity.setCustomerRoad(StringUtil.isBlank(panFactoryOrder.getCustomerAddress())?"":panFactoryOrder.getCustomerAddress());//顾客地址
|
|
|
|
|
advanceEntity.setSystemType("线上"); //订单类型
|
|
|
|
|
advanceEntity.setStoreNo(""); //门店编码
|
|
|
|
|
advanceEntity.setStoreName(""); //门店名称
|
|
|
|
|
advanceEntity.setStoreNo(StringUtil.isBlank(panFactoryOrder.getUserId())?"":panFactoryOrder.getUserId()); //门店编码
|
|
|
|
|
advanceEntity.setStoreName(StringUtil.isBlank(panFactoryOrder.getUserName())?"":panFactoryOrder.getUserName()); //门店名称
|
|
|
|
|
advanceEntity.setSerialKey(""); //序列号
|
|
|
|
|
advanceEntity.setServiceNum(StringUtil.isBlank(panFactoryOrder.getServiceNum())?"":panFactoryOrder.getServiceNum()); //服务号
|
|
|
|
|
advanceEntity.setMatingCode("");//齐套模式 可以为空
|
|
|
|
@ -103,19 +107,22 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
|
|
|
|
|
advanceEntity.setSenderMobile(StringUtil.isBlank(panFactoryOrder.getSenderMobile())?"":panFactoryOrder.getSenderMobile());//发货人电话 可以为空
|
|
|
|
|
advanceEntity.setSenderAddress(StringUtil.isBlank(panFactoryOrder.getSenderAddress())?"":panFactoryOrder.getSenderAddress()); //发货地址 可以为空
|
|
|
|
|
advanceEntity.setSenderName(StringUtil.isBlank(panFactoryOrder.getSendFactory())?"":panFactoryOrder.getSendFactory()); //发货工厂名称 可以为空
|
|
|
|
|
advanceEntity.setAdministratorsId(0);// 导入人
|
|
|
|
|
advanceEntity.setAdministratorsId(1078);// 导入人
|
|
|
|
|
advanceEntity.setCreateTime(LocalDate.now()); //添加时间
|
|
|
|
|
advanceEntity.setCarsNum(StringUtil.isBlank(panFactoryOrder.getDeliveryNumber())?"":panFactoryOrder.getDeliveryNumber()); //派车单--snm 可以为空
|
|
|
|
|
advanceEntity.setDeleteTime(0); // 删除时间
|
|
|
|
|
advanceEntity.setWaybillNo("");//运单号 可以为空
|
|
|
|
|
Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId()); |
|
|
|
|
advanceEntity.setWarehouseId(id); //导入人仓库id
|
|
|
|
|
Integer warehouseId = PanFactoryEnum.getId(panFactoryOrder.getPlantId()); |
|
|
|
|
advanceEntity.setWarehouseId(warehouseId); //导入人仓库id
|
|
|
|
|
advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态:1=未开单,2=已开单
|
|
|
|
|
advanceEntity.setOldId(0);//
|
|
|
|
|
advanceEntity.setFreeze(Byte.parseByte("1"));//冻结状态:1=正常,2=冻结
|
|
|
|
|
advanceEntity.setDeleteReason("");//删除原因
|
|
|
|
|
advanceEntity.setDeleteAdministratorsId(0);//删除用户
|
|
|
|
|
Integer advanceId = iAdvanceClient.addAdvanceClient(advanceEntity); |
|
|
|
|
advanceId = iAdvanceClient.addAdvanceClient(advanceEntity); |
|
|
|
|
}else{ |
|
|
|
|
advanceId = advanceEntity.getId(); |
|
|
|
|
} |
|
|
|
|
if(advanceId > 0){ |
|
|
|
|
//更改订单状态
|
|
|
|
|
panFactoryOrder.setStatus(0); |
|
|
|
@ -130,6 +137,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
|
|
|
|
|
//通过订单id查询对应的包件
|
|
|
|
|
QueryWrapper<PanPackageInfo> packageQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
packageQueryWrapper.eq("order_id",orderId) |
|
|
|
|
.eq("status",1) |
|
|
|
|
.eq("is_deleted",0); |
|
|
|
|
List<PanPackageInfo> packages = panPackageInfoService.list(packageQueryWrapper); |
|
|
|
|
for(PanPackageInfo panPackageInfo:packages){ |
|
|
|
@ -222,41 +230,49 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ServiceNumEntity serviceNum = new ServiceNumEntity(); |
|
|
|
|
serviceNum.setServiceNum(StringUtil.isBlank(panFactoryOrder.getServiceNum())?"":panFactoryOrder.getServiceNum()); //服务号
|
|
|
|
|
String sn = StringUtil.isBlank(panFactoryOrder.getServiceNum()) ? "" : panFactoryOrder.getServiceNum(); |
|
|
|
|
ServiceNumEntity serviceNum = serviceNumClient.findByserviceNum(sn); |
|
|
|
|
if(Objects.isNull(serviceNum)){ |
|
|
|
|
serviceNum = new ServiceNumEntity(); |
|
|
|
|
serviceNum.setServiceNum(sn); //服务号
|
|
|
|
|
serviceNum.setTotal("1"); //订单数量
|
|
|
|
|
serviceNum.setDetailTotal(Objects.isNull(panFactoryOrder.getServiceCount())?"":panFactoryOrder.getServiceCount()+""); // 包数量
|
|
|
|
|
serviceNum.setStoreName(StringUtil.isBlank(panFactoryOrder.getUserName())?"":panFactoryOrder.getUserName()); //商场名
|
|
|
|
|
serviceNum.setStoreNo(""); // 商场编号
|
|
|
|
|
serviceNum.setStoreNo(StringUtil.isBlank(panFactoryOrder.getUserId())?"":panFactoryOrder.getUserId()); // 商场编号
|
|
|
|
|
serviceNum.setCustomerName(StringUtil.isBlank(panFactoryOrder.getCustomerName())?"":panFactoryOrder.getCustomerName());//顾客姓名
|
|
|
|
|
serviceNum.setCustomerPhone(StringUtil.isBlank(panFactoryOrder.getCustomerNumber())?"":panFactoryOrder.getCustomerNumber()); //顾客电话
|
|
|
|
|
serviceNum.setCustomerRoad(""); //顾客地址
|
|
|
|
|
serviceNum.setCustomerRoad(StringUtil.isBlank(panFactoryOrder.getCustomerAddress())?"":panFactoryOrder.getCustomerAddress()); //顾客地址
|
|
|
|
|
serviceNum.setIsOpai(1); //是否干仓配
|
|
|
|
|
serviceNum.setCompleteSet("V"); //齐套标识:Y=齐套,N=未齐套,V=未知
|
|
|
|
|
// serviceNum.setCreateTime(LocalDate.now());
|
|
|
|
|
serviceNum.setDeleteTime(0); |
|
|
|
|
serviceNumEntityList.add(serviceNum); |
|
|
|
|
}else{ |
|
|
|
|
log.info("#############handlerDataToHt: 当前服务号已存在数据serviceNum={}",sn); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if(!serviceNumEntityList.isEmpty()){ |
|
|
|
|
serviceNumClient.addServiceNum(serviceNumEntityList); |
|
|
|
|
} |
|
|
|
|
log.info("##############handlerDataToHt: 处理数据完成"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
@Async |
|
|
|
|
public void handlerMtDataToHt() { |
|
|
|
|
public void handlerMtDataToHt(Long mainId) { |
|
|
|
|
log.info("################handlerMtDataToHt: 处理梦天订单数据到"); |
|
|
|
|
//查询需要同步的订单
|
|
|
|
|
QueryWrapper<MtFactoryOrder> orderQueryWrapper = new QueryWrapper<>(); |
|
|
|
|
orderQueryWrapper.eq("status",1) |
|
|
|
|
.eq("main_id",mainId) |
|
|
|
|
.eq("is_deleted",0); |
|
|
|
|
List<MtFactoryOrder> mtFactoryOrders = mtFactoryOrderService.list(orderQueryWrapper); |
|
|
|
|
List<ServiceNumEntity> serviceNumEntityList = new ArrayList<>(); |
|
|
|
|
log.info("#########handlerMtDataToHt: 待处理的订单数量为{}",mtFactoryOrders.size()); |
|
|
|
|
MtFactoryOrderMain mtFactoryOrderMain = mtFactoryOrderMainService.getById(mainId); |
|
|
|
|
for (MtFactoryOrder mtFactoryOrder:mtFactoryOrders){ |
|
|
|
|
Long orderId = mtFactoryOrder.getId(); |
|
|
|
|
Long mainId = mtFactoryOrder.getMainId(); |
|
|
|
|
MtFactoryOrderMain mtFactoryOrderMain = mtFactoryOrderMainService.getById(mainId); |
|
|
|
|
|
|
|
|
|
log.info("#########handlerMtDataToHt: 当前处理的订单id={}",orderId); |
|
|
|
|
|
|
|
|
|