aike/emis-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-11-17 22:27:01 +08:00
parent 7cf527dec5
commit 809014565c
1 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -458,8 +458,17 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(rcvProviceCode==null){ if(rcvProviceCode==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确"); throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确");
} }
String rcvCityCode=getChildRegionCodeByName(receiveCountryCode,rcvProviceCode,emisWaybillSave.getReceiveCity());
String rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode,rcvCityCode,emisWaybillSave.getReceiveCounty());
String rcvCityCode=null;
if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCity())) {
rcvCityCode=getChildRegionCodeByName(receiveCountryCode, rcvProviceCode, emisWaybillSave.getReceiveCity());
}
String rcvDistrictCode=null;
if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCounty())) {
rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode, rcvCityCode, emisWaybillSave.getReceiveCounty());
}
emisWaybillSave.setReceiveCountry(receiveCountryCode); emisWaybillSave.setReceiveCountry(receiveCountryCode);
emisWaybillSave.setReceiveProvince(rcvProviceCode); emisWaybillSave.setReceiveProvince(rcvProviceCode);
@ -475,8 +484,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(sendProviceCode==null){ if(sendProviceCode==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "寄件省不正确"); throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "寄件省不正确");
} }
String sendCityCode=getChildRegionCodeByName(sendCountryCode,sendProviceCode,emisWaybillSave.getSendCity()); String sendCityCode=null;
String sendDistrictCode=getChildRegionCodeByName(sendCountryCode,sendCityCode,emisWaybillSave.getSendCounty()); if(!StringUtils.isEmpty(emisWaybillSave.getSendCity())) {
sendCityCode=getChildRegionCodeByName(sendCountryCode, sendProviceCode, emisWaybillSave.getSendCity());
}
String sendDistrictCode = null;
if(!StringUtils.isEmpty(emisWaybillSave.getSendCounty())) {
sendDistrictCode = getChildRegionCodeByName(sendCountryCode, sendCityCode, emisWaybillSave.getSendCounty());
}
emisWaybillSave.setSendCountry(sendCountryCode); emisWaybillSave.setSendCountry(sendCountryCode);
emisWaybillSave.setSendProvince(sendProviceCode); emisWaybillSave.setSendProvince(sendProviceCode);
@ -686,8 +702,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(rcvProviceCode==null){ if(rcvProviceCode==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确"); throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "收件省不正确");
} }
String rcvCityCode=getChildRegionCodeByName(receiveCountryCode,rcvProviceCode,emisWaybillSave.getReceiveCity());
String rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode,rcvCityCode,emisWaybillSave.getReceiveCounty()); String rcvCityCode=null;
if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCity())) {
rcvCityCode=getChildRegionCodeByName(receiveCountryCode, rcvProviceCode, emisWaybillSave.getReceiveCity());
}
String rcvDistrictCode=null;
if(!StringUtils.isEmpty(emisWaybillSave.getReceiveCounty())) {
rcvDistrictCode=getChildRegionCodeByName(receiveCountryCode, rcvCityCode, emisWaybillSave.getReceiveCounty());
}
emisWaybillSave.setReceiveCountry(receiveCountryCode); emisWaybillSave.setReceiveCountry(receiveCountryCode);
emisWaybillSave.setReceiveProvince(rcvProviceCode); emisWaybillSave.setReceiveProvince(rcvProviceCode);
@ -703,8 +727,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(sendProviceCode==null){ if(sendProviceCode==null){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "寄件省不正确"); throw new EmisBizError(EmisBizErrorType.NOT_EXISTS, "寄件省不正确");
} }
String sendCityCode=getChildRegionCodeByName(sendCountryCode,sendProviceCode,emisWaybillSave.getSendCity());
String sendDistrictCode=getChildRegionCodeByName(sendCountryCode,sendCityCode,emisWaybillSave.getSendCounty()); String sendCityCode=null;
if(!StringUtils.isEmpty(emisWaybillSave.getSendCity())) {
sendCityCode=getChildRegionCodeByName(sendCountryCode, sendProviceCode, emisWaybillSave.getSendCity());
}
String sendDistrictCode=null;
if(!StringUtils.isEmpty(emisWaybillSave.getSendCounty())) {
sendDistrictCode=getChildRegionCodeByName(sendCountryCode, sendCityCode, emisWaybillSave.getSendCounty());
}
emisWaybillSave.setSendCountry(sendCountryCode); emisWaybillSave.setSendCountry(sendCountryCode);
emisWaybillSave.setSendProvince(sendProviceCode); emisWaybillSave.setSendProvince(sendProviceCode);