hexiugang 2 år sedan
förälder
incheckning
a97101895c

+ 5 - 1
watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/TaobaoTask.java

@@ -361,7 +361,11 @@ public class TaobaoTask {
             if (trade.getReceiverDistrict() != null && !" ".equals(trade.getReceiverDistrict())) {
                 order.setSalesAddressPostcode(findZip(trade.getReceiverState(), trade.getReceiverCity(), trade.getReceiverDistrict(), trade.getReceiverAddress()));
             } else {
-                order.setSalesAddressPostcode(findZip(trade.getReceiverState(), trade.getReceiverCity(), trade.getReceiverTown(), trade.getReceiverAddress()));
+                if (trade.getReceiverTown() != null && !"".equals(trade.getReceiverTown().trim())) {
+                    order.setSalesAddressPostcode(findZip(trade.getReceiverState(), trade.getReceiverCity(), trade.getReceiverTown(), trade.getReceiverAddress()));
+                } else {
+                    order.setSalesAddressPostcode(findZip(trade.getReceiverState(), trade.getReceiverCity(), trade.getReceiverCity(), trade.getReceiverAddress()));
+                }
             }
         }
         order.setSalesAddressName(trade.getReceiverName());