aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-13 19:17:16 +08:00
parent 27c4638c62
commit 802a982bce
4 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
View File

@ -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.exception.EmisBizError;
import com.xdadan.erp.oms.domain.vo.AddressParseResult; import com.xdadan.erp.oms.domain.vo.AddressParseResult;
import com.xdadan.erp.oms.service.*; 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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -48,10 +48,10 @@ public class Oms2cCommonController extends BaseController
@Autowired @Autowired
RedissonService redissonService; RedissonService redissonService;
private IApiwebCommonSvc iApiwebCommonSvc; private IApiwebSvc iApiwebSvc;
public Oms2cCommonController(IApiwebCommonSvc iApiwebCommonSvc) { public Oms2cCommonController(IApiwebSvc iApiwebSvc) {
this.iApiwebCommonSvc = iApiwebCommonSvc; this.iApiwebSvc = iApiwebSvc;
} }
/** /**
@ -61,7 +61,7 @@ public class Oms2cCommonController extends BaseController
public AjaxResult realMatchWaybill(String useSiteCode,String prefix) public AjaxResult realMatchWaybill(String useSiteCode,String prefix)
{ {
try { try {
return this.iApiwebCommonSvc.realMatchWaybill(useSiteCode,"T7080"); return this.iApiwebSvc.realMatchWaybill(useSiteCode,"T7080");
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
return AjaxResult.error(ex.getMessage()); return AjaxResult.error(ex.getMessage());

9
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
View File

@ -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.exception.EmisBizError;
import com.xdadan.erp.oms.domain.vo.*; import com.xdadan.erp.oms.domain.vo.*;
import com.xdadan.erp.oms.service.*; import com.xdadan.erp.oms.service.*;
import com.xdadan.erp.oms.service.svc.IApiwebSvc;
import com.xdadan.erp.oms.service.svc.IApiwebWaybillSvc; import com.xdadan.erp.oms.service.svc.IApiwebWaybillSvc;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -57,10 +58,10 @@ public class Oms2cWaybillController extends BaseController
@Autowired @Autowired
private IEmisTmsScanRecordService emisTmsScanRecordService; private IEmisTmsScanRecordService emisTmsScanRecordService;
private IApiwebWaybillSvc iApiwebWaybillSvc; private IApiwebSvc iApiwebSvc;
public Oms2cWaybillController(IApiwebWaybillSvc iApiwebWaybillSvc) { public Oms2cWaybillController(IApiwebSvc iApiwebSvc) {
this.iApiwebWaybillSvc = iApiwebWaybillSvc; this.iApiwebSvc = iApiwebSvc;
} }
@ -162,7 +163,7 @@ public class Oms2cWaybillController extends BaseController
@PostMapping(value = "/preCalcWaybillFee") @PostMapping(value = "/preCalcWaybillFee")
public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder) public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder)
{ {
return iApiwebWaybillSvc.preCalcWaybillFee(waybillOrder); return this.iApiwebSvc.preCalcWaybillFee(waybillOrder);
} }

19
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebCommonSvc.java
View File

@ -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);
}

15
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebWaybillSvc.java → emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebSvc.java
View File

@ -10,9 +10,20 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(name = "${service.provider.name}",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class}) @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") @PostMapping(value = "/apiweb/emisWaybill/preCalcWaybillFee")
public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder); public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder);
} }