1/12

src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java

@@ -451,22 +451,22 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
                 }
             }
         }
-        CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
+//        CustomerStoreVo customerStoreVo=customerStoreService.getStoreBySid(vo.getCustomerSid()).getData();
-        if(null!=customerStoreVo){
+//        if(null!=customerStoreVo){
-            vo.setAddressName(customerStoreVo.getStoreName());
+//            vo.setAddressName(customerStoreVo.getStoreName());
-            vo.setValue(customerStoreVo.getStoreSid());
+//            vo.setValue(customerStoreVo.getStoreSid());
-            vo.setCustomerName(customerStoreVo.getName());
+//            vo.setCustomerName(customerStoreVo.getName());
-            vo.setCPhone(customerStoreVo.getPhone());
+//            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());
-//            }
 //        }
+        //上次取货点
+        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);