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