diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 56e2fa7bf..33052b358 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -572,34 +572,57 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { // distributionStockArticleEntity.setWarehouse(t.getName()); // distributionStockArticleEntity.setWarehouseId(t.getId()); } - } - String customerName = wayBillEntity.getTakeCompany();//客户名称 + String customerName = wayBillEntity.getTakeCompany();//客户名称 - //通过客户名称去查询客户的服务类型、 - distributionStockArticleEntity.setTypeService("1");//默认商配 + BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName); + log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity); + if (!Objects.isNull(basicdataClientEntity)) { + //商城 + distributionStockArticleEntity.setMallId(basicdataClientEntity.getId()); + distributionStockArticleEntity.setMallName(basicdataClientEntity.getClientName()); + distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); - BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName); - log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity); - if (!Objects.isNull(basicdataClientEntity)) { - //商城 - distributionStockArticleEntity.setMallId(basicdataClientEntity.getId()); - distributionStockArticleEntity.setMallName(basicdataClientEntity.getClientName()); - distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); - - distributionStockArticleEntity.setDealerCode(basicdataClientEntity.getClientCode()); - distributionStockArticleEntity.setDealerName(basicdataClientEntity.getClientName()); + distributionStockArticleEntity.setDealerCode(basicdataClientEntity.getClientCode()); + distributionStockArticleEntity.setDealerName(basicdataClientEntity.getClientName()); - // todo 这里需要去查询门店 和新系统的门店ID 进行绑定 - String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId()); - log.info("订单同步peisongType {} ", peisongType); + // todo 这里需要去查询门店 和新系统的门店ID 进行绑定 + String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId()); + log.info("订单同步peisongType {} ", peisongType); - if (StringUtil.isNoneBlank(peisongType)) { - distributionStockArticleEntity.setTypeService(peisongType); + if (StringUtil.isNoneBlank(peisongType)) { + distributionStockArticleEntity.setTypeService(peisongType); + } } } + + + //通过客户名称去查询客户的服务类型、 + distributionStockArticleEntity.setTypeService("1");//默认商配 + +// BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(customerName); +// log.info("订单同步出现的客户编号{} 匹配的客户", basicdataClientEntity); +// if (!Objects.isNull(basicdataClientEntity)) { +// //商城 +// distributionStockArticleEntity.setMallId(basicdataClientEntity.getId()); +// distributionStockArticleEntity.setMallName(basicdataClientEntity.getClientName()); +// distributionStockArticleEntity.setMallCode(basicdataClientEntity.getClientCode()); +// +// distributionStockArticleEntity.setDealerCode(basicdataClientEntity.getClientCode()); +// distributionStockArticleEntity.setDealerName(basicdataClientEntity.getClientName()); +// +// +// // todo 这里需要去查询门店 和新系统的门店ID 进行绑定 +// String peisongType = getPeisongTypeByClientId(basicdataClientEntity.getId()); +// log.info("订单同步peisongType {} ", peisongType); +// +// if (StringUtil.isNoneBlank(peisongType)) { +// distributionStockArticleEntity.setTypeService(peisongType); +// } +// } + distributionStockArticleEntity.setGenre(1); distributionStockArticleEntity.setAdvanceId(advanceId); //--------------2023-07-06 新增字段处理