From 056e10e2705661139d2fc0f28fb126635ed69082 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期五, 16 九月 2022 14:52:29 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 83cbc65..a2f5809 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2252,14 +2252,20 @@
         String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
         BeanUtils.copyProperties(storeVO, sysUserDO);
         sysUserDO.setAccount(storeVO.getStoreAccount());
-        sysUserDO.setType(5);
+        sysUserDO.setType(20);
+        sysUserDO.setCommunityId(communityId);
         sysUserDO.setAreaId(null);
         sysUserDO.setStatus(1);
         sysUserDO.setPhone(storeVO.getPhone());
         sysUserDO.setName(storeVO.getContacts());
         sysUserDO.setPassword(encode);
+        sysUserDO.setAppId("wx0cef797390444b75");
         try {
             insert = userDao.insert(sysUserDO);
+            SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
+            sysUserRoleDO.setUserId(sysUserDO.getUserId());
+            sysUserRoleDO.setRoleId(sysRoleDO.getRoleId());
+            sysUserRoleDAO.insert(sysUserRoleDO);
             // 把SysUserId赋值给店铺
             if (sysUserDO.getUserId() != null) {
                 userDao.updateStoreByPhone(storeVO.getPhone(), sysUserDO.getUserId());
@@ -3637,8 +3643,8 @@
     }
 
     @Override
-    public R resetPassword(Integer type, String account) {
-        SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,account).eq(SysUserDO::getType,type));
+    public R resetPassword(Integer type, String account,String appId) {
+        SysUserDO sysUserDO=userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getAccount,account).eq(SysUserDO::getType,type).eq(SysUserDO::getAppId,appId));
         if(sysUserDO!=null){
             sysUserDO.setPassword("$2a$10$F/2lE2NMhKNHJfi5.FLmfu7jIr7ImRWgCTTeO6m3IRNR2V4sv8YR.");
             userDao.updateById(sysUserDO);
@@ -3662,6 +3668,15 @@
         return R.ok();
     }
 
+    @Override
+    public R accept(Long userId) {
+        SysUserDO sysUserDO=new SysUserDO();
+        sysUserDO.setUserId(userId);
+        sysUserDO.setIsAccept(1);
+        userDao.updateById(sysUserDO);
+        return R.ok();
+    }
+
 
     @Override
     public R getAreaAndStreet() {

--
Gitblit v1.7.1