diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java index a040e7e..ceda077 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java @@ -451,22 +451,22 @@ public class EmpCardService extends MybatisBaseService { } } } - CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData(); - if(null!=customerStoreVo){ - vo.setAddressName(customerStoreVo.getStoreName()); - vo.setValue(customerStoreVo.getStoreSid()); - vo.setCustomerName(customerStoreVo.getName()); - vo.setCPhone(customerStoreVo.getPhone()); - } - //上次取货点 -// LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData(); -// if (null != vo1) { -// LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData(); -// if (null != vo2) { -// vo.setAddressName(vo2.getName()); -// vo.setValue(vo2.getSid()); -// } +// CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData(); +// if(null!=customerStoreVo){ +// vo.setAddressName(customerStoreVo.getStoreName()); +// vo.setValue(customerStoreVo.getStoreSid()); +// vo.setCustomerName(customerStoreVo.getName()); +// vo.setCPhone(customerStoreVo.getPhone()); // } + //上次取货点 + LpkReserveOrderVo vo1 = lpkReserveOrderService.getStoreByCustomerSid(vo.getCustomerSid()).getData(); + if (null != vo1) { + LpkStoreDetailsVo vo2 = lpkStoreService.storeInit(vo1.getStoreSid()).getData(); + if (null != vo2) { + vo.setAddressName(vo2.getName()); + vo.setValue(vo2.getSid()); + } + } vo.setPName("企业菜窖"); vo.setOrderCardVoList(empReserveOrderCardVos); return rb.success().setData(vo);