diff --git a/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml b/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml index 9ea1b77..ff12253 100644 --- a/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/customerstore/CustomerStoreMapper.xml @@ -5,7 +5,7 @@ \ No newline at end of file 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 ceda077..a040e7e 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); diff --git a/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java b/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java index 1a0f22d..27fc8f1 100644 --- a/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/empreserveordergoods/EmpReserveOrderGoodsService.java @@ -104,7 +104,7 @@ public class EmpReserveOrderGoodsService extends MybatisBaseService