商城首页悬浮框统计接口合并

src/main/java/com/uas/platform/b2c/prod/product/common/api/CommonCountController.java

@@ -2,6 +2,8 @@ package com.uas.platform.b2c.prod.product.common.api;
 
 import com.uas.platform.b2c.prod.product.common.model.CommonCount;
 import com.uas.platform.b2c.prod.product.common.service.CommonCountService;
+import com.uas.platform.b2c.prod.store.model.StoreStatus;
+import com.uas.platform.b2c.prod.store.service.StoreInService;
 import com.uas.platform.b2c.trade.vendor.service.VendorIntroductionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -29,6 +31,9 @@ public class CommonCountController {
     @Autowired
     private VendorIntroductionService vendorIntroductionService;
 
+    @Autowired
+    private StoreInService storeInService;
+
     /**
      * 获取已激活的通用计数器
      * @return
@@ -86,15 +91,24 @@ public class CommonCountController {
     public List<CommonCount> findActivedCount() {
         List<CommonCount> commonCounts = new ArrayList<>();
         List<CommonCount> indexCounts = commonCountService.findByStatus((short) 1, "b2c_index" );
-        List<CommonCount> bannerCounts = commonCountService.findByStatus((short) 1, "mall_home_banner" );
-        Integer enCount = vendorIntroductionService.getVendorCount();
         commonCounts.addAll(indexCounts);
+
+        Integer storeCount = storeInService.countByStatus(StoreStatus.OPENED);
+        CommonCount storeCounts = new CommonCount();
+        storeCounts.setItem("店铺");
+        storeCounts.setCount(Double.valueOf(storeCount));
+        storeCounts.setUsedFor("b2c_index");
+        commonCounts.add(storeCounts);
+
+        Integer enCount = vendorIntroductionService.getVendorCount();
+        CommonCount vendorCounts = new CommonCount();
+        vendorCounts.setItem("供应商");
+        vendorCounts.setUsedFor("mall_home_banner");
+        vendorCounts.setCount(Double.valueOf(enCount));
+        commonCounts.add(vendorCounts);
+
+        List<CommonCount> bannerCounts = commonCountService.findByStatus((short) 1, "mall_home_banner" );
         commonCounts.addAll(bannerCounts);
-        CommonCount commonCount = new CommonCount();
-        commonCount.setItem("供应商数量");
-        commonCount.setCount(Double.valueOf(enCount));
-        commonCount.setUsedFor("b2c_index");
-        commonCounts.add(commonCount);
         return commonCounts;
     }
 

src/main/java/com/uas/platform/b2c/prod/store/dao/StoreInDao.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2c.prod.store.dao;
 
 import com.uas.platform.b2c.prod.store.model.StoreIn;
+import com.uas.platform.b2c.prod.store.model.StoreStatus;
 import com.uas.platform.b2c.prod.store.model.StoreType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -91,4 +92,12 @@ public interface StoreInDao extends JpaSpecificationExecutor<StoreIn>, JpaReposi
 			" from trade$goods g group by go_storeid ) a right join store$info i " +
 			" on a.go_storeid=i.ST_UUID where i.ST_TYPE ='ORIGINAL_FACTORY' order by m DESC")
 	List<StoreIn> findOriginalStoreIn();
+
+	/**
+	 * 根据店铺状态查询数量
+	 *
+	 * @param status 店铺状态
+	 * @return
+	 */
+    Integer countByStatus(StoreStatus status);
 }

src/main/java/com/uas/platform/b2c/prod/store/service/StoreInService.java

@@ -2,20 +2,17 @@ package com.uas.platform.b2c.prod.store.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2c.advertise.ad.model.StoreAdsType;
-import com.uas.platform.b2c.prod.store.model.Qualification;
-import com.uas.platform.b2c.prod.store.model.StoreApply;
-import com.uas.platform.b2c.prod.store.model.StoreIn;
-import com.uas.platform.b2c.prod.store.model.StoreStatus;
-import com.uas.platform.b2c.prod.store.model.StoreType;
+import com.uas.platform.b2c.prod.store.model.*;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 
 public interface StoreInService {
 
@@ -216,4 +213,11 @@ public interface StoreInService {
 	 * @return
 	 */
 	ResultMap findPCBStoreByEnuu(Long enuu);
+
+	/**
+	 * 根据店铺状态查询数量
+	 * @param status  店铺状态
+	 * @return
+	 */
+	Integer countByStatus(StoreStatus status);
 }

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreInServiceImpl.java

@@ -26,13 +26,7 @@ import com.uas.platform.b2c.prod.store.dao.StoreApplyDao;
 import com.uas.platform.b2c.prod.store.dao.StoreBrandInfoDao;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.prod.store.exception.EmptyParameterException;
-import com.uas.platform.b2c.prod.store.model.EnterpriseSimple;
-import com.uas.platform.b2c.prod.store.model.Qualification;
-import com.uas.platform.b2c.prod.store.model.StoreApply;
-import com.uas.platform.b2c.prod.store.model.StoreBrandInfo;
-import com.uas.platform.b2c.prod.store.model.StoreIn;
-import com.uas.platform.b2c.prod.store.model.StoreStatus;
-import com.uas.platform.b2c.prod.store.model.StoreType;
+import com.uas.platform.b2c.prod.store.model.*;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
 import com.uas.platform.b2c.trade.order.dao.PurchaseDao;
 import com.uas.platform.b2c.trade.support.ResultMap;
@@ -44,22 +38,6 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,6 +53,13 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
 /**
  * 店铺业务实现类
  *
@@ -810,4 +795,15 @@ public class StoreInServiceImpl implements StoreInService {
 		Integer pcbCount = pcbDao.CountPCBProuductByEnuu(enuu) > 0 ? 1 : 0;
 		return ResultMap.success(pcbCount);
 	}
+
+	/**
+	 * 根据店铺状态查询数量
+	 *
+	 * @param status 店铺状态
+	 * @return
+	 */
+	@Override
+	public Integer countByStatus(StoreStatus status) {
+		return storeDao.countByStatus(status);
+	}
 }