From 802a982bce3ad1b0303f81e8bea218c99f5514ce Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 13 Jul 2024 19:17:16 +0800 Subject: [PATCH] md --- .../erp/oms/web/Oms2cCommonController.java | 10 +++++----- .../erp/oms/web/Oms2cWaybillController.java | 9 +++++---- .../erp/oms/service/svc/IApiwebCommonSvc.java | 19 ------------------- ...IApiwebWaybillSvc.java => IApiwebSvc.java} | 15 +++++++++++++-- 4 files changed, 23 insertions(+), 30 deletions(-) delete mode 100644 emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebCommonSvc.java rename emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/{IApiwebWaybillSvc.java => IApiwebSvc.java} (67%) diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java index a9468d2..099a7b2 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java @@ -18,7 +18,7 @@ import com.xdadan.erp.oms.common.utils.DateUtils; import com.xdadan.erp.oms.domain.exception.EmisBizError; import com.xdadan.erp.oms.domain.vo.AddressParseResult; import com.xdadan.erp.oms.service.*; -import com.xdadan.erp.oms.service.svc.IApiwebCommonSvc; +import com.xdadan.erp.oms.service.svc.IApiwebSvc; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -48,10 +48,10 @@ public class Oms2cCommonController extends BaseController @Autowired RedissonService redissonService; - private IApiwebCommonSvc iApiwebCommonSvc; + private IApiwebSvc iApiwebSvc; - public Oms2cCommonController(IApiwebCommonSvc iApiwebCommonSvc) { - this.iApiwebCommonSvc = iApiwebCommonSvc; + public Oms2cCommonController(IApiwebSvc iApiwebSvc) { + this.iApiwebSvc = iApiwebSvc; } /** @@ -61,7 +61,7 @@ public class Oms2cCommonController extends BaseController public AjaxResult realMatchWaybill(String useSiteCode,String prefix) { try { - return this.iApiwebCommonSvc.realMatchWaybill(useSiteCode,"T7080"); + return this.iApiwebSvc.realMatchWaybill(useSiteCode,"T7080"); }catch (Exception ex){ ex.printStackTrace(); return AjaxResult.error(ex.getMessage()); diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index e92c2cc..04f77dc 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -21,6 +21,7 @@ import com.xdadan.erp.oms.common.utils.DateUtils; import com.xdadan.erp.oms.domain.exception.EmisBizError; import com.xdadan.erp.oms.domain.vo.*; import com.xdadan.erp.oms.service.*; +import com.xdadan.erp.oms.service.svc.IApiwebSvc; import com.xdadan.erp.oms.service.svc.IApiwebWaybillSvc; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -57,10 +58,10 @@ public class Oms2cWaybillController extends BaseController @Autowired private IEmisTmsScanRecordService emisTmsScanRecordService; - private IApiwebWaybillSvc iApiwebWaybillSvc; + private IApiwebSvc iApiwebSvc; - public Oms2cWaybillController(IApiwebWaybillSvc iApiwebWaybillSvc) { - this.iApiwebWaybillSvc = iApiwebWaybillSvc; + public Oms2cWaybillController(IApiwebSvc iApiwebSvc) { + this.iApiwebSvc = iApiwebSvc; } @@ -162,7 +163,7 @@ public class Oms2cWaybillController extends BaseController @PostMapping(value = "/preCalcWaybillFee") public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder) { - return iApiwebWaybillSvc.preCalcWaybillFee(waybillOrder); + return this.iApiwebSvc.preCalcWaybillFee(waybillOrder); } diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebCommonSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebCommonSvc.java deleted file mode 100644 index 30fe75e..0000000 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebCommonSvc.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.xdadan.erp.oms.service.svc; - - -import com.xdadan.erp.oms.common.core.domain.AjaxResult; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@FeignClient(name = "${service.provider.name}",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class}) -public interface IApiwebCommonSvc { - - /** - * 获取电子面单单号 - */ - @GetMapping(value = "/apiweb/common/realMatchWaybill") - public AjaxResult realMatchWaybill(@RequestParam("useSiteCode")String useSiteCode, @RequestParam("prefix")String prefix); - - -} \ No newline at end of file diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebWaybillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebSvc.java similarity index 67% rename from emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebWaybillSvc.java rename to emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebSvc.java index b90884e..d2d1fff 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebWaybillSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebSvc.java @@ -10,9 +10,20 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @FeignClient(name = "${service.provider.name}",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class}) -public interface IApiwebWaybillSvc { +public interface IApiwebSvc { + /** + * 获取电子面单单号 + */ + @GetMapping(value = "/apiweb/common/realMatchWaybill") + public AjaxResult realMatchWaybill(@RequestParam("useSiteCode")String useSiteCode, @RequestParam("prefix")String prefix); + + + /** + * 运费试算 + * @param waybillOrder + * @return + */ @PostMapping(value = "/apiweb/emisWaybill/preCalcWaybillFee") public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder); - } \ No newline at end of file