Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -919,6 +919,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				basicdataClient.setCargoControl(false);
 				basicdataClient.setStatus(1);
 				basicdataClient.setIsDeleted(0);
+				log.info(">>>>>> 11111 {}", basicdataClient);
 
 				// 默认付款方式
 				String keyValue = matchDictValue(DictBizCache.getList(OPEN_ORDER_PAY_WAY), i.getDefaultPaymentMethods().trim());
@@ -933,9 +934,10 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 				String typeValue= matchDictValue(DictBizCache.getList(DISTRIBUTION_TYPE), i.getMold());
 
 				basicdataClient.setTypeService(StringUtil.isNoneBlank(typeValue)?Integer.parseInt(typeValue):null);
-
+				log.info(">>>>>> 22222 {}", basicdataClient);
 				List<RegionAllVO> regionAllVOList= redis.get("blade:sys:regions::SimpleKey []");
 				if (!Objects.isNull(i.getBladeRegionProvinceName())){
+					log.info(">>>>>> 3333 {}", basicdataClient);
 					List<RegionAllVO> collect = regionAllVOList.stream().filter(f -> i.getBladeRegionProvinceName().equals(f.getLabel())).collect(Collectors.toList());
 					if (!collect.isEmpty()) {
 						RegionAllVO regionAllVO = collect.get(0);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -276,7 +276,7 @@ public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<Basicdat
 		List<BasicdataClientEntity> basicdataClientEntityList = basicdataClientService.list(Wrappers.<BasicdataClientEntity>query().lambda()
 			.in(BasicdataClientEntity::getClientName, clientNames)
 		);
-		if (basicdataClientEntityList.isEmpty()) {
+		if (!basicdataClientEntityList.isEmpty()) {
 			throw new ServiceException(clientNames+"查询客户信息错误");
 		}
 		Map<String, List<BasicdataClientEntity>> listMap = basicdataClientEntityList.stream().collect(Collectors.groupingBy(BasicdataClientEntity::getClientName));