优化代码

java110-bean/src/main/java/com/java110/dto/store/StoreUserDto.java

@@ -29,6 +29,8 @@ public class StoreUserDto extends PageDto implements Serializable {
 
     private String staffName;
 
+    private String staffId;
+
     //商户地址
     private String address;
 
@@ -195,4 +197,12 @@ public class StoreUserDto extends PageDto implements Serializable {
     public void setStaffTel(String staffTel) {
         this.staffTel = staffTel;
     }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
 }

java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml

@@ -574,4 +574,24 @@
         </where>
     </select>
 
+
+    <select id="getStoreStaffs" parameterType="Map" resultType="Map">
+        select t.name storeName,t.address,su.user_id staffId , t.store_id storeId
+        from s_store t
+        inner join s_store_user su on t.store_id = su.store_id and su.status_cd = '0'
+        <if test="">
+            and su.rel_cd = #{relCd}
+        </if>
+        where
+        1=1
+        <if test="storeTypeCd != null and storeTypeCd != ''">
+            t.store_type_cd = #{storeTypeCd}
+        </if>
+        <if test="storeId != null and storeId != ''">
+            t.store_id = #{storeId}
+        </if>
+
+        and t.status_cd = '0'
+    </select>
+
 </mapper>

java110-interface/src/main/java/com/java110/intf/store/IStoreInnerServiceSMO.java

@@ -36,4 +36,12 @@ public interface IStoreInnerServiceSMO {
      */
     @RequestMapping(value = "/getStoreUserInfo", method = RequestMethod.POST)
     public List<StoreUserDto> getStoreUserInfo(@RequestBody StoreUserDto storeUserDto);
+
+    /**
+     * 查询商户员工
+     * @param storeUserDto
+     * @return
+     */
+    @RequestMapping(value = "/getStoreStaffs", method = RequestMethod.POST)
+    public List<StoreUserDto> getStoreStaffs(@RequestBody StoreUserDto storeUserDto);
 }

service-store/src/main/java/com/java110/store/dao/IStoreServiceDao.java

@@ -292,4 +292,10 @@ public interface IStoreServiceDao {
      */
     public List<Map> getStoreUserInfo(Map info) throws DAOException;
 
+    /**
+     * 查询商户员工
+     * @param beanCovertMap
+     * @return
+     */
+    List<Map> getStoreStaffs(Map beanCovertMap) throws DAOException;
 }

service-store/src/main/java/com/java110/store/dao/impl/StoreServiceDaoImpl.java

@@ -561,4 +561,10 @@ public class StoreServiceDaoImpl extends BaseServiceDao implements IStoreService
         List<Map> storeUserInfos = sqlSessionTemplate.selectList("storeServiceDaoImpl.getStoreUserInfo", info);
         return storeUserInfos;
     }
+
+    @Override
+    public List<Map> getStoreStaffs(Map info) throws DAOException {
+        List<Map> storeUserInfos = sqlSessionTemplate.selectList("storeServiceDaoImpl.getStoreStaffs", info);
+        return storeUserInfos;
+    }
 }

service-store/src/main/java/com/java110/store/smo/impl/StoreInnerServiceSMOImpl.java

@@ -1,17 +1,21 @@
 package com.java110.store.smo.impl;
 
-import com.java110.dto.store.StoreAttrDto;
-import com.java110.dto.store.StoreUserDto;
-import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.intf.store.IStoreInnerServiceSMO;
 import com.java110.dto.PageDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.store.StoreAttrDto;
 import com.java110.dto.store.StoreDto;
+import com.java110.dto.store.StoreUserDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.store.IStoreInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.store.dao.IStoreServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +32,9 @@ public class StoreInnerServiceSMOImpl extends BaseServiceSMO implements IStoreIn
     @Autowired
     private IStoreServiceDao storeServiceDaoImpl;
 
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
     @Override
     public List<StoreDto> getStores(@RequestBody StoreDto storeDto) {
         //校验是否传了 分页信息
@@ -76,6 +83,52 @@ public class StoreInnerServiceSMOImpl extends BaseServiceSMO implements IStoreIn
         return storeUserInfos;
     }
 
+    /**
+     * 查询商户员工信息
+     *
+     * @param storeUserDto
+     * @return
+     */
+    @Override
+    public List<StoreUserDto> getStoreStaffs(StoreUserDto storeUserDto) {
+        int page = storeUserDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            storeUserDto.setPage((page - 1) * storeUserDto.getRow());
+        }
+
+        List<StoreUserDto> storeUserDtos = BeanConvertUtil.covertBeanList(
+                storeServiceDaoImpl.getStoreStaffs(BeanConvertUtil.beanCovertMap(storeUserDto)), StoreUserDto.class);
+
+        if (storeUserDtos == null || storeUserDtos.size() == 0) {
+            return storeUserDtos;
+        }
+
+        String[] userIds = getUserIds(storeUserDtos);
+        //根据 userId 查询用户信息
+        List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(userIds);
+
+        for (StoreUserDto tmpStoreUserDto : storeUserDtos) {
+            for(UserDto userDto : users){
+                if(tmpStoreUserDto.getStaffId().equals(userDto.getUserId())){
+                    tmpStoreUserDto.setStaffName(userDto.getName());
+                    tmpStoreUserDto.setStaffTel(userDto.getTel());
+                }
+            }
+        }
+        return storeUserDtos;
+    }
+
+    private String[] getUserIds(List<StoreUserDto> storeUserDtos) {
+
+        List<String> userIds = new ArrayList<>();
+        for (StoreUserDto storeUserDto : storeUserDtos) {
+            userIds.add(storeUserDto.getStaffId());
+        }
+
+        return userIds.toArray(new String[userIds.size()]);
+    }
+
 
     public IStoreServiceDao getStoreServiceDaoImpl() {
         return storeServiceDaoImpl;