|
@@ -539,14 +539,22 @@ public class AwaitSendController {
|
|
|
if (addrs.length <= 3) {
|
|
|
addrs = salesOrderInfo.getSalesAddressInfo().split("-");
|
|
|
}
|
|
|
+ String tel = null;
|
|
|
+ String addr = "";
|
|
|
+ if (salesOrderInfo.getSalesAddressTel().contains("转")) {
|
|
|
+ tel = salesOrderInfo.getSalesAddressTel().split("转")[0];
|
|
|
+ addr = "[" + salesOrderInfo.getSalesAddressTel() + "]";
|
|
|
+ } else {
|
|
|
+ tel = salesOrderInfo.getSalesAddressTel();
|
|
|
+ }
|
|
|
String addrDetails = salesOrderInfo.getSalesAddressInfo().substring(addrs[0].length() + addrs[1].length() + addrs[2].length() + 3);
|
|
|
Map<String, Object> receiver = new HashMap<String, Object>(7);
|
|
|
receiver.put("Name", salesOrderInfo.getSalesAddressName());
|
|
|
- receiver.put("Tel", salesOrderInfo.getSalesAddressTel());
|
|
|
+ receiver.put("Tel", tel);
|
|
|
receiver.put("ProvinceName", AddrUtil.dealProvince(addrs[0]));
|
|
|
receiver.put("CityName", addrs[1]);
|
|
|
receiver.put("ExpAreaName", addrs[2]);
|
|
|
- receiver.put("Address", addrDetails);
|
|
|
+ receiver.put("Address", addrDetails + addr);
|
|
|
receiver.put("PostCode", salesOrderInfo.getSalesAddressPostcode());
|
|
|
eOrderRequestData.Receiver = (receiver);
|
|
|
/* 发件人信息 */
|