Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
yi.wang
b1f5e364 1 parent 1e327b67

返回提示信息修改

Inline Side-by-side
Showing 6 changed files with 35 additions and 15 deletions
...@@ -78,11 +78,26 @@ public class CustomsDataInterface { ...@@ -78,11 +78,26 @@ public class CustomsDataInterface {
78 mawb.getMawbDetailList().forEach(d->{ 78 mawb.getMawbDetailList().forEach(d->{
79 d.setMsgId(saveIClearApiLogResult.getMsgId()); 79 d.setMsgId(saveIClearApiLogResult.getMsgId());
80 }); 80 });
81 - Mawb saveMawbResult= mawbService.saveMawb(mawb); 81 + Map<String,String> map = mawbService.saveMawb(mawb);
82 - if(!Objects.equals(saveMawbResult,null)){ 82 + if(map != null && map.get("success").equals("true")){
83 - log.info("请求数据主单号"+mawb.getBillNo()+"保存成功，msgId："+saveMawbResult.getMsgId()); 83 + log.info("请求数据主单号"+mawb.getBillNo()+"保存成功，msgId："+map.get("msg"));
84 }else{ 84 }else{
85 log.info("请求数据主单号"+mawb.getBillNo()+"保存失败"); 85 log.info("请求数据主单号"+mawb.getBillNo()+"保存失败");
86 + String [] erroeMes = map.get("msg").split("interpolatedMessage=");
87 + String msg = "";
88 + if (erroeMes != null){
89 + for (int i =1;i<erroeMes.length;i++){
90 + if (i== erroeMes.length -1){
91 + msg += erroeMes[i].substring(0,erroeMes[i].indexOf(","));
92 + }else{
93 + msg += erroeMes[i].substring(0,erroeMes[i].indexOf(","))+",";
94 + }
95 + }
96 + }
97 + sw.stop();
98 + result.setCode("30001");
99 + result.setMsg(msg);
100 + return result;
86 } 101 }
87 }else{ 102 }else{
88 log.info("请求日志保存失败，BillNo："+mawb.getBillNo()); 103 log.info("请求日志保存失败，BillNo："+mawb.getBillNo());
...@@ -133,6 +148,7 @@ public class CustomsDataInterface { ...@@ -133,6 +148,7 @@ public class CustomsDataInterface {
133 //6、return result 148 //6、return result
134 result.setSuccess(Boolean.TRUE); 149 result.setSuccess(Boolean.TRUE);
135 result.setCode("0"); 150 result.setCode("0");
151 + result.setMsg("操作成功");
136 return result; 152 return result;
137 } 153 }
138 } 154 }
......
...@@ -11,4 +11,5 @@ public class IClearCheckResponseResult implements Serializable { ...@@ -11,4 +11,5 @@ public class IClearCheckResponseResult implements Serializable {
11 //成功标识 11 //成功标识
12 private Boolean success = false; 12 private Boolean success = false;
13 private String message; 13 private String message;
14 + private String code;
14 } 15 }
......
...@@ -23,9 +23,7 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -23,9 +23,7 @@ import org.springframework.beans.factory.annotation.Value;
23 import org.springframework.stereotype.Service; 23 import org.springframework.stereotype.Service;
24 import org.springframework.validation.annotation.Validated; 24 import org.springframework.validation.annotation.Validated;
25 25
26 -import java.util.ArrayList; 26 +import java.util.*;
27 -import java.util.List;
28 -import java.util.Objects;
29 27
30 /** 28 /**
31 * @author Administrator 29 * @author Administrator
...@@ -52,16 +50,20 @@ public class MawbService { ...@@ -52,16 +50,20 @@ public class MawbService {
52 * 保存主单Request 50 * 保存主单Request
53 * @param mawb 51 * @param mawb
54 */ 52 */
55 - public Mawb saveMawb(Mawb mawb){ 53 + public Map<String,String> saveMawb(Mawb mawb){
56 - Mawb result=null; 54 + Map<String,String> map = new HashMap<>();
57 try{ 55 try{
58 log.info("saveMawb start>>>>>>>>>>>"); 56 log.info("saveMawb start>>>>>>>>>>>");
59 - result =mawbRepository.save(mawb); 57 + Mawb mawb1 = mawbRepository.save(mawb);
60 log.info("saveMawb end>>>>>>>>>>>"); 58 log.info("saveMawb end>>>>>>>>>>>");
59 + map.put("success","true");
60 + map.put("msg",mawb1.getMsgId().toString());
61 }catch (Exception e){ 61 }catch (Exception e){
62 log.error("saveMawb() error:"+e.getMessage()); 62 log.error("saveMawb() error:"+e.getMessage());
63 + map.put("success","false");
64 + map.put("msg",e.getMessage());
63 } 65 }
64 - return result; 66 + return map;
65 } 67 }
66 68
67 69
...@@ -103,6 +105,7 @@ public class MawbService { ...@@ -103,6 +105,7 @@ public class MawbService {
103 String json = HttpClientUtil.post(config); 105 String json = HttpClientUtil.post(config);
104 IClearCheckResponseResult iclearCheckResponseResult = JsonToJava.parseJson(json, IClearCheckResponseResult.class); 106 IClearCheckResponseResult iclearCheckResponseResult = JsonToJava.parseJson(json, IClearCheckResponseResult.class);
105 result.setSuccess(iclearCheckResponseResult.getSuccess()); 107 result.setSuccess(iclearCheckResponseResult.getSuccess());
108 + result.setCode(iclearCheckResponseResult.getCode());
106 result.setMsg(iclearCheckResponseResult.getMessage()); 109 result.setMsg(iclearCheckResponseResult.getMessage());
107 log.info("<<<<<<<< checkMawb start >>>>>>>>>> mawb："+gson.toJson(mawb) +" result :" +result.getSuccess() +" iclear check response : " + json + " status : " + result.getSuccess()); 110 log.info("<<<<<<<< checkMawb start >>>>>>>>>> mawb："+gson.toJson(mawb) +" result :" +result.getSuccess() +" iclear check response : " + json + " status : " + result.getSuccess());
108 }catch (Exception e){ 111 }catch (Exception e){
......
...@@ -26,9 +26,9 @@ api: ...@@ -26,9 +26,9 @@ api:
26 password: toQu3arch6 26 password: toQu3arch6
27 address: 27 address:
28 #IClear校验运单地址 28 #IClear校验运单地址
29 - iclear-check-url: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliD 29 + iclear-check-url: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliD
30 #IClear校验C类运单地址 30 #IClear校验C类运单地址
31 - iclear-check-url-c: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliC 31 + iclear-check-url-c: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliC
32 #获取token地址 32 #获取token地址
33 token-url: https://apiuat.iclrccd-fedex.com/login 33 token-url: https://apiuat.iclrccd-fedex.com/login
34 #刷新token地址 34 #刷新token地址
......
...@@ -27,7 +27,7 @@ api: ...@@ -27,7 +27,7 @@ api:
27 #IClear校验运单地址 27 #IClear校验运单地址
28 iclear-check-url: https://www.iclrccd-fedex.com/chmConsignmentController/checkChmAndDetaliD 28 iclear-check-url: https://www.iclrccd-fedex.com/chmConsignmentController/checkChmAndDetaliD
29 #IClear校验C类运单地址 29 #IClear校验C类运单地址
30 - iclear-check-url-c: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliC 30 + iclear-check-url-c: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliC
31 #获取token地址 31 #获取token地址
32 token-url: https://api.iclrccd-fedex.com/export/login 32 token-url: https://api.iclrccd-fedex.com/export/login
33 #刷新token地址 33 #刷新token地址
......
...@@ -25,9 +25,9 @@ api: ...@@ -25,9 +25,9 @@ api:
25 password: toQu3arch6 25 password: toQu3arch6
26 address: 26 address:
27 #IClear校验运单地址 27 #IClear校验运单地址
28 - iclear-check-url: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliD 28 + iclear-check-url: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliD
29 #IClear校验C类运单地址 29 #IClear校验C类运单地址
30 - iclear-check-url-c: http://40.73.78.157:8080/chmConsignmentController/checkChmAndDetaliC 30 + iclear-check-url-c: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliC
31 #获取token地址 31 #获取token地址
32 token-url: https://apiuat.iclrccd-fedex.com/login 32 token-url: https://apiuat.iclrccd-fedex.com/login
33 #刷新token地址 33 #刷新token地址
......