1、 购物车数据分页异常问题处理，购物车自定义时间筛选问题处理

2、 用户修改手机，修改邮箱同步到账户中心方法更新

src/main/java/com/uas/platform/b2b/controller/CartController.java

@@ -64,7 +64,7 @@ public class CartController {
 	 * 购物车信息（搜索）
 	 *
 	 * @param params
-	 * @param keyword
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/cartList", method = RequestMethod.GET)

src/main/java/com/uas/platform/b2b/controller/UserController.java

@@ -202,7 +202,7 @@ public class UserController {
 	 * @return
 	 */
 	@RequestMapping(method = RequestMethod.PUT)
-	public ResponseEntity<String> saveUser(@RequestBody String json, HttpServletRequest request) {
+	public ResponseEntity<String> saveUser(@RequestBody String json, HttpServletRequest request) throws Exception {
 		User user = FlexJsonUtils.fromJson(json, User.class);
 		user = userService.updateUserInfo(user);
 		if (user != null) {

src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -53,7 +53,7 @@ public interface UserService {
 	 * @param user
 	 * @return
 	 */
-	User updateUserInfo(User user);
+	User updateUserInfo(User user) throws Exception;
 
 	// /**
 	// * 通过校验码验证手机号，更改手机号码

src/main/java/com/uas/platform/b2b/service/impl/CartServiceImpl.java

@@ -54,7 +54,7 @@ public class CartServiceImpl implements CartService {
 	public SPage<PurchaseOrderAll> getCartList(PageParams params, String searchFilter) {
 		SearchFilter filter = FlexJsonUtil.fromJson(searchFilter, SearchFilter.class);
 		SPage<PurchaseOrderAll> orders = new SPage<PurchaseOrderAll>();
-		final PageInfo pageInfo = new PageInfo();
+		final PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.UNAUDIT.value());
 		pageInfo.filter("userUU", SystemSession.getUser().getUserUU());
@@ -62,16 +62,16 @@ public class CartServiceImpl implements CartService {
 			pageInfo.expression(PredicateUtils.gte("date", new Date(filter.getFromDate()), false));
 		if (filter.getEndDate() != null)
 			pageInfo.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
-		Page<PurchaseOrderAll> ordersInfo = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
+		Page<PurchaseOrderAll> ordersInfos = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
 			public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
 				return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
 			}
 		}, pageInfo);
-		orders.setContent(ordersInfo.getContent());
-		orders.setPage(ordersInfo.getNumber());
-		orders.setTotalElement(ordersInfo.getTotalElements());
-		orders.setSize(ordersInfo.getSize());
-		orders.setTotalPage(ordersInfo.getTotalPages());
+		orders.setContent(ordersInfos.getContent());
+		orders.setPage(ordersInfos.getNumber());
+		orders.setTotalElement(ordersInfos.getTotalElements());
+		orders.setSize(ordersInfos.getSize());
+		orders.setTotalPage(ordersInfos.getTotalPages());
 		return orders;
 	}
 

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -164,7 +164,7 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public User updateUserInfo(User user) {
+	public User updateUserInfo(User user) throws Exception {
 		User newUser = userDao.findOne(user.getUserUU());
 		if (newUser != null) {
 			if (!newUser.getUserTel().equals(user.getUserTel().trim())) {// 修改了用户手机号
@@ -172,6 +172,7 @@ public class UserServiceImpl implements UserService {
 				if (users.size() > 0) {
 					throw new IllegalOperatorException("电话号码重复，建议输入您自己的手机号");
 				}
+				AccountUtils.updateTel(user.getUserTel().trim(),newUser.getUserTel().trim());
 			}
 			if (newUser.getUserEmail() != null) {
 				if (!newUser.getUserEmail().equals(user.getUserEmail().trim())) {// 修改了用户邮箱地址
@@ -179,6 +180,7 @@ public class UserServiceImpl implements UserService {
 					if (users.size() > 0) {
 						throw new IllegalOperatorException("邮箱地址重复，建议输入您自己的电子邮箱地址");
 					}
+					AccountUtils.updateEmail(user.getUserTel().trim(),newUser.getUserEmail().trim());
 				}
 				newUser.setUserEmail(user.getUserEmail().trim());
 			}

src/main/webapp/resources/js/index/app.js

@@ -15496,6 +15496,27 @@
             getDelveryCondition(zone, $scope.condition);
             $scope.tableParams.reload();
         };
+
+        $scope.openDatePicker = function ($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            item[openParam] = !item[openParam];
+        };
+
+        $scope.openFilterDatePicker = function ($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            item[openParam] = !item[openParam];
+            if ($scope.condition.dateFrom && $scope.condition.dateTo && !item[openParam]) {
+                $scope.tableParams.reload();
+            }
+        };
+
+        $scope.parseDate = function (dateStr) {
+            if (dateStr)
+                return Date.parse(dateStr, 'yyyy-MM-dd');
+            return new Date();
+        };
         $scope.setActive = function (state) {
             if ($scope.active != state) {
                 $scope.active = state;