瀏覽代碼

修改bug

xian 3 年之前
父節點
當前提交
0b323c2961
共有 2 個文件被更改,包括 11 次插入3 次删除
  1. 1 1
      pom.xml
  2. 10 2
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

+ 1 - 1
pom.xml

@@ -527,7 +527,7 @@
 		<dependency>
 			<groupId>com.taobao.taobao-sdk-java-auto</groupId>
 			<artifactId>taobao-sdk-java-auto</artifactId>
-			<version>2.0.0</version>
+			<version>3.0.0</version>
 		</dependency>
 
 	</dependencies>

+ 10 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -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);
         /* 发件人信息 */