fixed 会员信息更新

fuint-application/src/main/java/com/fuint/common/service/MemberService.java

@@ -60,11 +60,12 @@ public interface MemberService extends IService<MtUser> {
     /**
      * 编辑会员
      *
-     * @param  reqUserDto
+     * @param  reqUserDto 会员信息
+     * @param  modifyPassword 修改密码
      * @throws BusinessCheckException
      * @return
      */
-    MtUser updateMember(MtUser reqUserDto) throws BusinessCheckException;
+    MtUser updateMember(MtUser reqUserDto, boolean modifyPassword) throws BusinessCheckException;
 
     /**
      * 通过手机号添加会员

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -406,13 +406,14 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
      * 更新会员信息
      *
      * @param  mtUser 会员信息
+     * @param  modifyPassword 修改密码
      * @throws BusinessCheckException
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "修改会员信息")
-    public MtUser updateMember(MtUser mtUser) throws BusinessCheckException {
+    public MtUser updateMember(MtUser mtUser, boolean modifyPassword) throws BusinessCheckException {
         mtUser.setUpdateTime(new Date());
 
         MtUser oldUserInfo = mtUserMapper.selectById(mtUser.getId());
@@ -438,7 +439,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
                 }
             }
         }
-        if (mtUser.getPassword() != null) {
+        if (mtUser.getPassword() != null && modifyPassword) {
             String salt = SeqUtil.getRandomLetter(4);
             mtUser.setSalt(salt);
             mtUser.setPassword(enCodePassword(mtUser.getPassword(), salt));

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -206,7 +206,7 @@ public class BackendMemberController extends BaseController {
         }
 
         userInfo.setStatus(status);
-        memberService.updateMember(userInfo);
+        memberService.updateMember(userInfo, false);
 
         return getSuccessResult(true);
     }
@@ -302,7 +302,7 @@ public class BackendMemberController extends BaseController {
             memberInfo.setStoreId(storeId);
             memberService.addMember(memberInfo);
         } else {
-            memberService.updateMember(memberInfo);
+            memberService.updateMember(memberInfo, false);
         }
         return getSuccessResult(true);
     }
@@ -434,7 +434,7 @@ public class BackendMemberController extends BaseController {
         }
 
         userInfo.setPassword(password);
-        memberService.updateMember(userInfo);
+        memberService.updateMember(userInfo, true);
 
         return getSuccessResult(true);
     }

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java

@@ -162,7 +162,7 @@ public class ClientSignController extends BaseController {
         MtUser userInfo = memberService.queryMemberById(loginInfo.getId());
         userInfo.setOpenId(mpUserInfo.get("openid").toString());
         userInfo.setStoreId(Integer.parseInt(storeId));
-        MtUser mtUser = memberService.updateMember(userInfo);
+        MtUser mtUser = memberService.updateMember(userInfo, false);
 
         if (mtUser == null) {
             return getFailureResult(0, "用户状态异常");

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSystemController.java

@@ -123,7 +123,7 @@ public class ClientSystemController extends BaseController {
         if (mtUser != null && (mtUser.getStoreId() == null || mtUser.getStoreId() < 1)) {
             mtUser.setStoreId(storeInfo.getId());
             mtUser.setUpdateTime(new Date());
-            memberService.updateMember(mtUser);
+            memberService.updateMember(mtUser, false);
         }
 
         StoreDto storeDto = new StoreDto();

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserController.java

@@ -242,6 +242,7 @@ public class ClientUserController extends BaseController {
         String mobile = "";
         Integer merchantId = merchantService.getMerchantId(merchantNo);
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
+        boolean modifyPassword = false;
         if (userInfo == null) {
             return getFailureResult(1001);
         }
@@ -265,6 +266,7 @@ public class ClientUserController extends BaseController {
                 }
             }
             mtUser.setPassword(password);
+            modifyPassword = true;
         }
         if (sex.equals(1) || sex.equals(0) || sex.equals(2)) {
             mtUser.setSex(sex);
@@ -279,7 +281,7 @@ public class ClientUserController extends BaseController {
             mtUser.setAvatar(avatar);
         }
 
-        MtUser result = memberService.updateMember(mtUser);
+        MtUser result = memberService.updateMember(mtUser, modifyPassword);
         return getSuccessResult(result);
     }
 
@@ -296,7 +298,7 @@ public class ClientUserController extends BaseController {
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
         if (userInfo != null && storeId > 0) {
             MtUser mtUser = memberService.queryMemberById(userInfo.getId());
-            memberService.updateMember(mtUser);
+            memberService.updateMember(mtUser, false);
         }
 
         Map<String, Object> outParams = new HashMap<>();