购物车查找和统计数量修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9879 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -61,7 +61,7 @@ public class CartController {
 		pageParams.getFilters().put("ca_useruu", SystemSession.getUser().getUserUU());
 		pageParams.getFilters().put("ca_status", Status.UNAUDIT.value());
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("ca_date", false, Type.LONG, new Long(1)));
+		sortList.add(new Sort("ca_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchCartCheckIds(keyword, pageParams);
 	}

src/main/java/com/uas/platform/b2b/dao/CartDao.java

@@ -30,4 +30,14 @@ public interface CartDao extends JpaSpecificationExecutor<Cart>, JpaRepository<C
 	 */
 	@Query("select count(o) from Cart o where o.enUU = :enUU and o.status = :status")
 	public int getTodoCountByEnUUAndStatus(@Param("enUU") long enUU, @Param("status") int status);
+
+	/**
+	 *  查询当前用户在当前企业中待处理的购物车数量
+	 * @param uu
+	 * @param userUU
+	 * @param value
+	 * @return
+	 */
+	@Query("select count(o) from Cart o where o.enUU = :enUU and o.userUU = :userUU and o.status = :status")
+	int getTodoCountByEnUUAndUserUUAndStatus(@Param("enUU") long enUU, @Param("userUU") long userUU, @Param("status") int status);
 }

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

@@ -1,33 +1,12 @@
 package com.uas.platform.b2b.service.impl;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
-
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.CartDao;
 import com.uas.platform.b2b.dao.CartDetailDao;
 import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
 import com.uas.platform.b2b.dao.VendorDao;
 import com.uas.platform.b2b.event.PurchaseOrderSaveReleaseEvent;
-import com.uas.platform.b2b.model.Cart;
-import com.uas.platform.b2b.model.CartDetail;
-import com.uas.platform.b2b.model.PurchaseOrderAll;
-import com.uas.platform.b2b.model.PurchaseOrderAllItem;
-import com.uas.platform.b2b.model.Vendor;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.CartService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
@@ -37,6 +16,21 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.search.b2b.model.SPage;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Service
 public class CartServiceImpl implements CartService {
@@ -189,8 +183,7 @@ public class CartServiceImpl implements CartService {
 
 	@Override
 	public Object getCartTodoCount() {
-		return cartDao.getTodoCountByEnUUAndStatus(SystemSession.getUser().getEnterprise().getUu(),
-				Status.UNAUDIT.value());
+		return cartDao.getTodoCountByEnUUAndUserUUAndStatus(SystemSession.getUser().getEnterprise().getUu(), SystemSession.getUser().getUserUU(), Status.UNAUDIT.value());
 	}
 
 	@Override