Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
11c7c96b 1 parent 25c7b28f

PI-11-功能扩展-06： 

接口校验信息调整
mt
2023年3月6日17:36:32
Inline Side-by-side
Showing 3 changed files with 13 additions and 5 deletions
...@@ -102,11 +102,17 @@ public class FedexDataInterface { ...@@ -102,11 +102,17 @@ public class FedexDataInterface {
102 sw.start("checkFedexMawb"); 102 sw.start("checkFedexMawb");
103 String msg = result.getMsg(); 103 String msg = result.getMsg();
104 String iclearCheckMsg = fedexService.checkFedexMawb(saveMawbFedexResult,appInfo).getMsg(); 104 String iclearCheckMsg = fedexService.checkFedexMawb(saveMawbFedexResult,appInfo).getMsg();
105 - if(StringUtil.isEmpty(msg) && StringUtil.isEmpty(iclearCheckMsg)){ 105 + if(result.getSuccess() && StringUtil.isEmpty(iclearCheckMsg)){
106 result.setSuccess(Boolean.TRUE); 106 result.setSuccess(Boolean.TRUE);
107 }else{ 107 }else{
108 + if(result.getSuccess()){
109 + //基本非空信息验证通过，并且iclear验证失败
110 + result.setMsg(iclearCheckMsg);
111 + }else{
112 + //基本非空信息验证失败，并且iclear验证失败
108 result.setMsg(msg+";"+iclearCheckMsg); 113 result.setMsg(msg+";"+iclearCheckMsg);
109 } 114 }
115 + }
110 sw.stop(); 116 sw.stop();
111 117
112 log.info(sw.prettyPrint()); 118 log.info(sw.prettyPrint());
......
...@@ -166,13 +166,13 @@ public class ChmConsignmentDetailService { ...@@ -166,13 +166,13 @@ public class ChmConsignmentDetailService {
166 result.setSkuName(mawbDetail.getGname()); 166 result.setSkuName(mawbDetail.getGname());
167 //成交数量 167 //成交数量
168 result.setKnockdownNumber(bigDecimalFormat(BigDecimal.valueOf(mawbDetail.getGqty().doubleValue()))); 168 result.setKnockdownNumber(bigDecimalFormat(BigDecimal.valueOf(mawbDetail.getGqty().doubleValue())));
169 + //第二法定数量
170 + result.setQtyLegalSecond(bigDecimalFormat(mawbDetail.getSecondQty()));
169 //第二计量单位 171 //第二计量单位
170 DictionaryEntries secondUnitDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.TRANSACTION_UNIT+ mawbDetail.getSecondUnit()); 172 DictionaryEntries secondUnitDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.TRANSACTION_UNIT+ mawbDetail.getSecondUnit());
171 if(!Objects.equals(secondUnitDictionaryEntries,null)){ 173 if(!Objects.equals(secondUnitDictionaryEntries,null)){
172 result.setUnitLegalSecondId(secondUnitDictionaryEntries); 174 result.setUnitLegalSecondId(secondUnitDictionaryEntries);
173 result.setUnitLegalSecond(secondUnitDictionaryEntries.getChineseName()); 175 result.setUnitLegalSecond(secondUnitDictionaryEntries.getChineseName());
174 - //第二法定数量
175 - result.setQtyLegalSecond(bigDecimalFormat(mawbDetail.getSecondQty()));
176 } 176 }
177 177
178 //成交币制 178 //成交币制
......
...@@ -169,11 +169,12 @@ public class FedexService { ...@@ -169,11 +169,12 @@ public class FedexService {
169 */ 169 */
170 public ResultRS checkBasfInterfaceData(Fedexc fedexc, AppInfo appInfo){ 170 public ResultRS checkBasfInterfaceData(Fedexc fedexc, AppInfo appInfo){
171 171
172 - ResultRS result = new ResultRS(Boolean.FALSE,null,null); 172 + ResultRS result = new ResultRS(Boolean.TRUE,null,null);
173 173
174 if(Objects.equals(fedexc,null)){ 174 if(Objects.equals(fedexc,null)){
175 result.setCode(ErrorCodeEnum.ERROR_7.getCode()); 175 result.setCode(ErrorCodeEnum.ERROR_7.getCode());
176 result.setMsg(ErrorCodeEnum.ERROR_7.getName()); 176 result.setMsg(ErrorCodeEnum.ERROR_7.getName());
177 + result.setSuccess(Boolean.FALSE);
177 }else{ 178 }else{
178 List<String> msgList = new ArrayList<>(); 179 List<String> msgList = new ArrayList<>();
179 // 参数consignmentCode不能为空 180 // 参数consignmentCode不能为空
...@@ -204,8 +205,9 @@ public class FedexService { ...@@ -204,8 +205,9 @@ public class FedexService {
204 } 205 }
205 if(msgList.size() > 0){ 206 if(msgList.size() > 0){
206 String join = msgList.stream().collect(Collectors.joining(";")); 207 String join = msgList.stream().collect(Collectors.joining(";"));
207 - result.setCode("-7"); 208 + result.setCode(ErrorCodeEnum.ERROR_7.getCode());
208 result.setMsg(join); 209 result.setMsg(join);
210 + result.setSuccess(Boolean.FALSE);
209 } 211 }
210 } 212 }
211 return result; 213 return result;
......