feat(ds): 重置密码不能一致

Signed-off-by: sunshihao <sunshihaoemail>

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/advich/MemberEmailActiveController.java

@@ -21,6 +21,7 @@ import com.slodon.b2b2c.model.member.advich.MemberRegisterActiveModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
 import com.slodon.b2b2c.seller.dto.VendorRegisterDTO;
 import com.slodon.b2b2c.system.dto.CountryAreaApiDto;
+import com.slodon.b2b2c.vo.member.MemberDetailVO;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -621,8 +622,10 @@ public class MemberEmailActiveController extends BaseController {
             memberNew.setMemberId(memberInfo.getMemberId());
             memberNew.setLoginPwd(Md5.getMd5String(loginPwd));
             memberNew.setUpdateTime(new Date());
+            Member member = memberModel.getMemberByMemberId(memberInfo.getMemberId());
+            String newPassword =member.getLoginPwd();
+            AssertUtil.isTrue(Md5.getMd5String(loginPwd).equals(newPassword), "新密码不能与上次密码一致!");
             memberModel.updateMember(memberNew);
-
             // 删除Redis中的验证码
             stringRedisTemplate.delete(redisKey);
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerVendorController.java

@@ -217,6 +217,8 @@ public class SellerVendorController extends BaseController {
 
         AssertUtil.isTrue(!Md5.getMd5String(oldPwd).equals(vendorDb.getVendorPassword()), "输入原密码不正确");
         AssertUtil.isTrue(!newPwd.equals(confirmPwd), "新密码与确认密码不一致");
+        String newPassword = Md5.getMd5String(confirmPwd);
+        AssertUtil.isTrue(vendorDb.getVendorPassword().equals(newPassword), "新密码不能与上次密码一致!");
         Vendor vendorUpdate = new Vendor();
         vendorUpdate.setVendorId(vendor.getVendorId());
         vendorUpdate.setVendorPassword(Md5.getMd5String(newPwd));