更改京东同步订单区域问题

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -1401,6 +1401,8 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                         salesOrder.setSalesAddressName(consigneeObj.getString("receiverName"));
                         salesOrder.setSalesAddressTel(consigneeObj.getString("receiverMobile"));
                         String receiverState = "",receiverCity="",receiverDistrict="",receiverAddress="";
+
+
                         if("JD".equals(platformId)){
                             //因为狗东的地址信息过于离谱，所以需要单独分开，特殊处理
                             //省
@@ -1408,7 +1410,14 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                             //市
                             receiverCity = consigneeObj.getString("receiverCity");
                             //区
-                            receiverDistrict = consigneeObj.getString("receiverCountry");
+                            if (consigneeObj.has("receiverDistrict")) {
+                                receiverDistrict = consigneeObj.getString("receiverDistrict");
+                            } else if (consigneeObj.has("receiverCountry")) {
+                                receiverDistrict = consigneeObj.getString("receiverCountry");
+                            } else {
+                                LoggerFactory.getLogger(OrderSyncLogServiceImpl.class).info("区域获取失败,订单号:{}", salesOrder.getSalesOrderId());
+                            }
+
                             //地址
                             receiverAddress = consigneeObj.getString("receiverAddress");
                             if(receiverState.contains("上海") || receiverState.contains("北京")