diff --git a/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java b/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java index 551cff8..43a97f6 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/CarFacade.java @@ -21,6 +21,4 @@ public interface CarFacade { @PostMapping("/car/getCarByCarCondition") Result getCarByCarCondition(@RequestBody CarQueryConditionReq req); - @GetMapping("/sys/getDictDataByDicTypeAndValue") - Result getDictDataByDicTypeAndValue(@RequestParam(name = "dicType") String dicType, @RequestParam(name = "dicValue") String dicValue); } \ No newline at end of file diff --git a/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java b/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java index 980457c..109e595 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/StoreFacade.java @@ -2,7 +2,9 @@ package com.sczx.order.thirdpart.facade; import com.sczx.order.common.Result; import com.sczx.order.thirdpart.dto.CompanyStoreDTO; +import com.sczx.order.thirdpart.dto.SysDictDataDTO; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -11,4 +13,8 @@ public interface StoreFacade { @RequestMapping("/pub/getStoreById") Result getStoreById(@RequestParam(name = "storeId") Integer storeId); + + + @GetMapping("/sys/getDictDataByDicTypeAndValue") + Result getDictDataByDicTypeAndValue(@RequestParam(name = "dicType") String dicType, @RequestParam(name = "dicValue") String dicValue); } diff --git a/src/main/java/com/sczx/order/thirdpart/integration/CarInteg.java b/src/main/java/com/sczx/order/thirdpart/integration/CarInteg.java index dd0f5b5..e800108 100644 --- a/src/main/java/com/sczx/order/thirdpart/integration/CarInteg.java +++ b/src/main/java/com/sczx/order/thirdpart/integration/CarInteg.java @@ -69,17 +69,6 @@ public class CarInteg { return null; } - public SysDictDataDTO getDictDataByDicTypeAndValue(String dicType, String dicValue){ - try{ - Result result = carFacade.getDictDataByDicTypeAndValue(dicType, dicValue); - if(result.isSuccess()){ - return result.getData(); - } - } catch (Exception e){ - log.error("根据字典类型和字典值获取字典数据失败",e); - throw new InnerException("根据字典类型和字典值获取字典数据失败"); - } - return null; - } + } diff --git a/src/main/java/com/sczx/order/thirdpart/integration/StoreInteg.java b/src/main/java/com/sczx/order/thirdpart/integration/StoreInteg.java index dc746d8..45bae94 100644 --- a/src/main/java/com/sczx/order/thirdpart/integration/StoreInteg.java +++ b/src/main/java/com/sczx/order/thirdpart/integration/StoreInteg.java @@ -3,6 +3,7 @@ package com.sczx.order.thirdpart.integration; import com.sczx.order.common.Result; import com.sczx.order.exception.InnerException; import com.sczx.order.thirdpart.dto.CompanyStoreDTO; +import com.sczx.order.thirdpart.dto.SysDictDataDTO; import com.sczx.order.thirdpart.facade.StoreFacade; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -27,4 +28,17 @@ public class StoreInteg { } return null; } + + public SysDictDataDTO getDictDataByDicTypeAndValue(String dicType, String dicValue){ + try{ + Result result = storeFacade.getDictDataByDicTypeAndValue(dicType, dicValue); + if(result.isSuccess()){ + return result.getData(); + } + } catch (Exception e){ + log.error("根据字典类型和字典值获取字典数据失败",e); + throw new InnerException("根据字典类型和字典值获取字典数据失败"); + } + return null; + } }