diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index b124926b..ff77cc9a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -1308,8 +1308,8 @@ public class OrderMasterController extends BaseController { orderListResponse.setGoodsAreaList(goods.getGoodsAreaList()); orderListResponse.setOrderMode(orderMaster.getOrderMode()); orderListResponse.setIsCall(orderMaster.getIsCall()); - logger.info("主单id{},主单数据{},省名字{},街道id{}",request.getId(),orderMaster,orderMaster.getProvinceName(),customerAddress.getStreetId()); - if (!StringUtils.isEmpty(orderMaster.getProvinceName())){ + logger.info("主单id{},主单数据{},省名字{},街道id{},是否有值{}",request.getId(),orderMaster,orderMaster.getProvinceName(),customerAddress.getStreetId(),StringUtils.isNotEmpty(orderMaster.getProvinceName())); + if (StringUtils.isNotEmpty(orderMaster.getProvinceName())){ orderListResponse.setProvinceId(orderMaster.getProvinceId()); orderListResponse.setCityId(orderMaster.getCityId()); orderListResponse.setCountryId(orderMaster.getCountryId()); @@ -1339,7 +1339,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setName(customerAddress.getName()); } - logger.info("主单id{},主单数据1{}",request.getId(),orderMaster); + logger.info("主单id{},主单数据1{}",request.getId(),orderListResponse); return AjaxResult.success(orderListResponse); } catch (Exception e) {