diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index dec6fd472..20d5e60f2 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -225,12 +225,16 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderVO.setDefaultDeliveryWay("2"); - Integer typeService = basicdataClientEntity.getTypeService(); - if (typeService == 1){ + String typeService = "1"; + BasicdataStoreBusinessEntity storeBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(clientId, 3); + if(!Objects.isNull(storeBusinessEntity)){ + typeService = storeBusinessEntity.getMold(); + } + if ("1".equals(typeService)){ openOrderVO.setDefaultDeliveryWay("2"); - }else if(typeService == 2){ + }else if("2".equals(typeService)){ openOrderVO.setDefaultDeliveryWay("3"); - }else if(typeService == 3){ + }else if("3".equals(typeService)){ openOrderVO.setDefaultDeliveryWay("1"); }