Browse Source

验证密码是否正确

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@744 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 years ago
parent
commit
d71f3018f8

+ 2 - 1
src/main/java/com/uas/platform/b2b/service/impl/PurchaseNoticeServiceImpl.java

@@ -24,6 +24,7 @@ import com.uas.platform.b2b.model.SaleSendItem;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
 import com.uas.platform.b2b.service.PurchaseNoticeService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.XingePusher;
 import com.uas.platform.b2b.support.XingePusher;
+import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.model.Status;
@@ -196,7 +197,7 @@ public class PurchaseNoticeServiceImpl implements PurchaseNoticeService {
 				thisQty += item.getQty();
 				thisQty += item.getQty();
 			double endQty = (notice.getEndQty() == null ? 0.0 : notice.getEndQty()) + thisQty;
 			double endQty = (notice.getEndQty() == null ? 0.0 : notice.getEndQty()) + thisQty;
 			if (endQty > notice.getQty())
 			if (endQty > notice.getQty())
-				throw new IllegalArgumentException("累计发货数量将超出本次送货提醒的需求数!");
+				throw new IllegalOperatorException("累计发货数量将超出本次送货提醒的需求数!");
 			PurchaseOrder order = notice.getOrderItem().getOrder();
 			PurchaseOrder order = notice.getOrderItem().getOrder();
 			send.setCurrency(order.getCurrency());
 			send.setCurrency(order.getCurrency());
 			send.setBackStatus((short) Status.NOT_UPLOAD.value());
 			send.setBackStatus((short) Status.NOT_UPLOAD.value());

+ 31 - 0
src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -10,6 +10,7 @@ import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.encry.Md5Utils;
 
 
@@ -71,4 +72,34 @@ public class UserServiceImpl implements UserService {
 		return userDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
 		return userDao.findByEnUU(SystemSession.getUser().getEnterprise().getUu());
 	}
 	}
 
 
+	@Override
+	public User updateUserInfo(User user) {
+		User newUser = userDao.findOne(user.getUserUU());
+		if(newUser != null) {
+			if(!newUser.getUserTel().equals(user.getUserTel().trim())) {//修改了用户手机号
+				List<User> users = userDao.findUserByUserTel(user.getUserTel().trim());
+				if(users.size() > 0) {
+					throw new IllegalOperatorException("电话号码重复,建议输入您自己的手机号");
+				}
+			}
+			if(!newUser.getUserTel().equals(user.getUserTel().trim())) {//修改了用户邮箱地址
+				List<User> users = userDao.findUserByUserEmail(user.getUserEmail().trim());
+				if(users.size() > 0) {
+					throw new IllegalOperatorException("邮箱地址重复,建议输入您自己的电子邮箱地址");
+				}
+			}
+			newUser.setUserEmail(user.getUserEmail().trim());
+			newUser.setUserName(user.getUserName());
+			newUser.setUserTel(user.getUserTel().trim());
+			newUser.setUserSex(user.getUserSex());
+			newUser.setUserIdcode(user.getUserIdcode());
+			newUser = userDao.save(newUser);
+			newUser.setEnterprise(SystemSession.getUser().getEnterprise());
+			SystemSession.setUser(newUser);
+			return newUser;
+		} else {
+			throw new IllegalOperatorException("修改的用户不存在");
+		}
+	}
+
 }
 }