Merge remote-tracking branch 'origin/feature/20200402_init_dev' into feature/20200402_init_dev

src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java

@@ -30,9 +30,8 @@ public class EmployeeController extends BaseController {
 
     /**
      * 新增成员
-     * @param employee 成员实体
      * @return
-     * @throws WxErrorException
+     * @throws Exception
      */
     @RequestMapping(value = "list",method = RequestMethod.POST)
     @ResponseBody
@@ -47,24 +46,23 @@ public class EmployeeController extends BaseController {
     }
     /**
      * 新增成员
-     * @param employee 成员实体
+     * @param response 请求响应
      * @return
-     * @throws WxErrorException
+     * @throws Exception
      */
     @RequestMapping(value = "qrCode",method = RequestMethod.GET)
     public void downLoadQrCode(HttpServletResponse response){
         try {
             employeeService.downLoadQrCode(response);
         }catch (Exception e){
-            log.error("添加用户失败",e);
+            log.error("下载二维码",e);
         }
     }
 
     /**
-     * 新增成员
+     * 同步成员
-     * @param employee 成员实体
      * @return
-     * @throws WxErrorException
+     * @throws Exception
      */
     @RequestMapping(value = "sync",method = RequestMethod.GET)
     @ResponseBody
@@ -82,7 +80,7 @@ public class EmployeeController extends BaseController {
      * 新增成员
      * @param employee 成员实体
      * @return
-     * @throws WxErrorException
+     * @throws Exception
      */
     @RequestMapping(value = "add",method = RequestMethod.POST)
     @ResponseBody
@@ -100,7 +98,7 @@ public class EmployeeController extends BaseController {
      * 修改成员
      * @param employee 成员实体
      * @return
-     * @throws WxErrorException
+     * @throws Exception
      */
     @RequestMapping(value = "update",method = RequestMethod.POST)
     @ResponseBody
@@ -116,9 +114,9 @@ public class EmployeeController extends BaseController {
 
     /**
      * 删除成员
-     * @param employee 成员实体
+     * @param cpUserId 成员id
      * @return
-     * @throws WxErrorException
+     * @throws Exception
      */
     @RequestMapping(value = "delete",method = RequestMethod.POST)
     @ResponseBody

src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java

@@ -64,7 +64,6 @@ public class EmployeeService {
     /**
      * 查询成员
      *
-     * @param employee 成员实体
      * @return
      * @throws WxErrorException
      */
@@ -144,7 +143,6 @@ public class EmployeeService {
     /**
      * 同步成员
      *
-     * @param employee 成员实体
      * @return
      * @throws WxErrorException
      */
@@ -242,7 +240,7 @@ public class EmployeeService {
     /**
      * 删除成员
      *
-     * @param employee 成员实体
+     * @param cpUserId 成员id
      * @return
      * @throws WxErrorException
      */

src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java

@@ -29,12 +29,11 @@ public class StoreEmployeeController extends BaseController {
      *
      * @return
      */
-    @RequestMapping(value = "list",method = RequestMethod.POST)
+    @RequestMapping(value = "list/excel",method = RequestMethod.POST)
     @ResponseBody
-    public Map<String,Object> listStoreUser(@RequestParam("storeId")Long storeId, @RequestParam("regionId")Long regionId,
+    public Map<String,Object> listStoreUser(@RequestParam("storeId")Long storeId, @RequestParam("regionId")Long regionId){
-                                            @RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize){
         try {
-            storeEmployeeService.listStoreUser(storeId,regionId,pageNum, pageSize);
+            storeEmployeeService.listStoreUser(storeId,regionId);
             return data(null);
         }catch (Exception e){
             log.error("添加用户失败",e);
@@ -46,7 +45,7 @@ public class StoreEmployeeController extends BaseController {
      *
      * @return
      */
-    @RequestMapping(value = "list",method = RequestMethod.POST)
+    @RequestMapping(value = "import",method = RequestMethod.POST)
     @ResponseBody
     public Map<String,Object> importShopEmpByExcel(@RequestParam("file") MultipartFile file) {
         try {

src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java

@@ -63,13 +63,10 @@ public class StoreEmployeeService {
      * 查询门店号
      * @param storeId 门店id
      * @param regionId 区域id
-     * @param pageNum 页码
-     * @param pageSize 每页显示条数
      */
-    public void listStoreUser(Long storeId, Long regionId, Integer pageNum, Integer pageSize) {
+    public void listStoreUser(Long storeId, Long regionId) {
         Map<String,Object> result = new HashMap<>();
         List<PoiStore> poiStores = null;
-        PageHelper.startPage(pageNum, pageSize);
         if (storeId != null){
             QueryWrapper<PoiStore> storeParams = new QueryWrapper<>();
             poiStores = poiStoreDOMapper.selectList(storeParams);
@@ -80,12 +77,9 @@ public class StoreEmployeeService {
         }
         List<StoreUserDTO> storeUserDTOS = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(poiStores)){
-            int orderNum = (pageNum -1) * pageSize;
             for(PoiStore store : poiStores) {
                 StoreUserDTO storeUserDTO = new StoreUserDTO();
                 BeanUtils.copyProperties(store,storeUserDTO);
-                //设置序号
-                storeUserDTO.setOrderNum(++orderNum);
                 //查询店铺绑定的企业微信
                 QueryWrapper<PrivilageCpUserStoreDO> relationParams = new QueryWrapper<>();
                 relationParams.eq(DATABASE_STORE_ID_KEY,storeUserDTO.getId());
@@ -102,8 +96,6 @@ public class StoreEmployeeService {
             }
         }
 
-        Page<StoreUserDTO> pageList = (Page<StoreUserDTO>)storeUserDTOS;
-
     }
 
     /**