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 288abe9..cd492aa 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 @@ -82,6 +82,11 @@ public class Oms2cCommonController extends BaseController @RequestMapping(value = "/getSignedPic") AjaxResult getSignedPic(String billCode,String tail4){ String picUrl = ""; + + if (StringUtils.isEmpty(billCode) || StringUtils.isEmpty(tail4)) { + return AjaxResult.error("参数错误"); + } + try { AjaxResult ar = this.iRpcWaybillSvc.getWaybillDetailByOms(billCode, ""); String code = ar.get("code").toString(); @@ -93,13 +98,25 @@ public class Oms2cCommonController extends BaseController if (ar.containsKey("data")) { String data = ar.get("data").toString(); JSONObject jobjData = JSONObject.parseObject(data); - picUrl = jobjData.getString("billPicDispatchRmk"); + + String recieverMobile = jobjData.getJSONObject("reciever").getString("phone"); + String senderMobile = jobjData.getJSONObject("sender").getString("phone"); + + String recieverMobileTail4=recieverMobile.substring(recieverMobile.length()-4); + String senderMobileTail4=senderMobile.substring(senderMobile.length()-4); + + if(tail4.equals(senderMobileTail4) || tail4.equals(senderMobileTail4) ) { + picUrl = jobjData.getString("billPicDispatchRmk"); + }else{ + return AjaxResult.error("尾号不正确!"); + } + } return AjaxResult.success("成功", picUrl); }catch (Exception ex){ ex.printStackTrace(); - return AjaxResult.success("成功", picUrl); + return AjaxResult.error("获取失败"); } }