diff --git a/src/main/java/com/kiisoo/ic/constants/Constants.java b/src/main/java/com/kiisoo/ic/constants/Constants.java
index 8dea57f..5a0da9b 100644
--- a/src/main/java/com/kiisoo/ic/constants/Constants.java
+++ b/src/main/java/com/kiisoo/ic/constants/Constants.java
@@ -64,6 +64,11 @@ public class Constants {
      */
     public static final String LOGIN_NO_PERMISSIONS = "1007";
 
+    /**
+     * 重置密码
+     */
+    public static final String PASSWORD_RESET = "123456";
+
     /** 数字对应周 */
     public static final Map<Long, String> SELLER_TYPE = new HashMap<Long, String>() {
         private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java b/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java
index eeea6b6..b8d1be7 100644
--- a/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java
+++ b/src/main/java/com/kiisoo/ic/store/entity/PoiStoreStaffVO.java
@@ -118,6 +118,10 @@ public class PoiStoreStaffVO {
 
 	private String isOpen;
 
+	/**
+	 * 账号id
+	 */
+	private Long accountId;
 	/**
 	 * 导购账号状态
 	 */
diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
index 1dc4ed9..17317b1 100644
--- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreStaffService.java
@@ -168,9 +168,10 @@ public class PoiStoreStaffService {
                 }
                 //账号信息
                 QueryWrapper<PrivilageAccountDO> wrapperAccount = new QueryWrapper<>();
-                wrapperAccount.eq("user_id",poiStoreStaff.getUserId());
+                wrapperAccount.eq("user_id",poiStoreStaff.getUserId()).eq("type",Constants.ACCOUNT_STATUS_UNABLE);
                 PrivilageAccountDO privilageAccountDO = privilageAccountDOMapper.selectOne(wrapperAccount);
                 if(privilageAccountDO!=null){
+                    poiStoreStaffVO.setAccountId(privilageAccountDO.getId());
                     if(privilageAccountDO.getStatus()!=null &&privilageAccountDO.getStatus()== 1){
                         poiStoreStaffVO.setAccountFlag(true);
                     }else{
@@ -179,6 +180,7 @@ public class PoiStoreStaffService {
                 }
                 list.add(poiStoreStaffVO);
             });
+            result.put("shopId",shopNameByUserId.getStoreId());
             //店铺信息
             PoiStore poiStore = poiStoreDOMapper.selectById(shopNameByUserId.getStoreId());
             if (null != poiStore) {
@@ -278,15 +280,20 @@ public class PoiStoreStaffService {
         PoiStoreStaff poiStoreStaff = poiStoreStaffDOMapper.selectById(id);
         PoiStoreStaffVO staffVO = new PoiStoreStaffVO();
         if (null == poiStoreStaff) return staffVO;
-        BeanUtils.copyProperties(staffVO, poiStoreStaff);
+        BeanUtils.copyProperties(poiStoreStaff,staffVO);
         PoiStore poiStore = poiStoreDOMapper.selectById(poiStoreStaff.getStoreId());
-        if (null != null) {
+        if (poiStore != null) {
             staffVO.setStoreName(poiStore.getName());
         }
         //用户信息
         PrivilageUserBean privilageUserBean = privilageUserDOMapper.selectUserInfoAndRoleInfo(poiStoreStaff.getUserId());
+        //账号
+        QueryWrapper<PrivilageAccountDO> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", poiStoreStaff.getUserId());
+        PrivilageAccountDO privilageAccountDO = privilageAccountDOMapper.selectOne(wrapper);
         staffVO.setName(privilageUserBean.getName());
         staffVO.setMobil(privilageUserBean.getMobil());
+        staffVO.setAccountId(privilageAccountDO.getId());
         return staffVO;
     }
     /**
diff --git a/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java b/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java
index 7cedb41..b48bc77 100644
--- a/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java
+++ b/src/main/java/com/kiisoo/ic/system/controller/PrivilageAccountController.java
@@ -8,6 +8,8 @@ import com.kiisoo.ic.system.bean.AccountBean;
 import com.kiisoo.ic.system.bean.ImportAccountErrorBean;
 import com.kiisoo.ic.system.bean.ModifyAccountInput;
 import com.kiisoo.ic.system.bean.SaveAccountInput;
+import com.kiisoo.ic.system.entity.PrivilageAccountDO;
+import com.kiisoo.ic.system.entity.PrivilageUserDO;
 import com.kiisoo.ic.system.enums.AccountEnum;
 import com.kiisoo.ic.system.service.PrivilageAccountService;
 import lombok.extern.slf4j.Slf4j;
@@ -128,6 +130,67 @@ public class PrivilageAccountController extends BaseController {
         }
     }
 
+    /**
+     * 重置密码
+     * @param accountId 账号
+     * @return 标识码
+     */
+    @ResponseBody
+    @PostMapping("/reset/password")
+    public Map<String, Object> resetPassword(@RequestParam("accountId") Long accountId) {
+        try {
+            int result = privilageAccountService.resetPassword(accountId);
+            if(result >0) {
+                return data(Boolean.TRUE);
+            }
+            return fail();
+        } catch (Exception e) {
+            log.error("重置密码出错", e);
+            return fail();
+        }
+    }
+    /**
+     * 姓名修改
+     * @param privilageUserDO 账号
+     * @return 标识码
+     */
+    @ResponseBody
+    @PostMapping("/name/modify")
+    public Map<String, Object> modifyName(PrivilageUserDO privilageUserDO) {
+        try {
+            int result = privilageAccountService.modifyUser(privilageUserDO);
+            if(result >0) {
+                return data(Boolean.TRUE);
+            }
+            return fail();
+        } catch (Exception e) {
+            log.error("修改出错", e);
+            return fail();
+        }
+    }
+
+    /**
+     * 修改账号状态
+     * @param accountId
+     * @param status
+     * @return 标识码
+     */
+    @ResponseBody
+    @PostMapping("/modify/status")
+    public Map<String, Object> modifyAccountStatus(@RequestParam("accountId") Long accountId, @RequestParam("status") Integer status) {
+        try {
+            Integer result = privilageAccountService.modifyAccountStatusById(accountId,status);
+            if(result>0){
+                return data(Boolean.TRUE);
+            }else{
+                return fail();
+            }
+        } catch (Exception e) {
+            log.error("修改账号状态出错", e);
+            return fail();
+        }
+    }
+
     /**
      * 上传账户信息
      *
diff --git a/src/main/java/com/kiisoo/ic/system/service/PrivilageAccountService.java b/src/main/java/com/kiisoo/ic/system/service/PrivilageAccountService.java
index 762ee4d..a516bc5 100644
--- a/src/main/java/com/kiisoo/ic/system/service/PrivilageAccountService.java
+++ b/src/main/java/com/kiisoo/ic/system/service/PrivilageAccountService.java
@@ -7,6 +7,7 @@ import com.kiisoo.ic.system.bean.ImportAccountErrorBean;
 import com.kiisoo.ic.system.bean.ModifyAccountInput;
 import com.kiisoo.ic.system.bean.SaveAccountInput;
 import com.kiisoo.ic.system.entity.PrivilageAccountDO;
+import com.kiisoo.ic.system.entity.PrivilageUserDO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -76,4 +77,10 @@ public interface PrivilageAccountService extends IService<PrivilageAccountDO> {
      * @return 如果失败会返回失败信息
      */
     List<ImportAccountErrorBean> uploadAccount(MultipartFile[] files, Long userId) throws IOException;
+
+    Integer modifyAccountStatusById(Long accountId, Integer status);
+
+    int resetPassword(Long accountId);
+
+    int modifyUser(PrivilageUserDO privilageUserDO);
 }
diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
index a4d040d..88d5016 100644
--- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kiisoo.ic.common.utils.MD5FileUtil;
+import com.kiisoo.ic.constants.Constants;
 import com.kiisoo.ic.domain.service.PrivilageDomainService;
 import com.kiisoo.ic.store.entity.PoiStore;
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
@@ -418,6 +419,30 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
         return errorBeanList;
     }
 
+    @Override
+    public Integer modifyAccountStatusById(Long accountId, Integer status) {
+        PrivilageAccountDO privilageAccountDO = new PrivilageAccountDO();
+        privilageAccountDO.setId(accountId);
+        privilageAccountDO.setStatus(status);
+        return privilageAccountDOMapper.updateById(privilageAccountDO);
+    }
+
+    @Override
+    public int resetPassword(Long accountId) {
+        String password = MD5FileUtil.getMD5String(Constants.PASSWORD_RESET);
+        PrivilageAccountDO privilageAccountDO = new PrivilageAccountDO();
+        privilageAccountDO.setId(accountId);
+        privilageAccountDO.setPassword(password);
+        privilageAccountDO.setUpdateTime(new Date());
+        return privilageAccountDOMapper.updateById(privilageAccountDO);
+    }
+
+    @Override
+    public int modifyUser(PrivilageUserDO privilageUserDO) {
+        privilageUserDO.setUpdateTime(new Date());
+        return privilageUserDOMapper.updateById(privilageUserDO);
+    }
+
     /**
      * 描述：是否是2007的excel，返回true是2007
      */