首页商城相关统计数据合并

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

@@ -2,6 +2,7 @@ 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.trade.vendor.service.VendorIntroductionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -10,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,6 +26,9 @@ public class CommonCountController {
     @Autowired
     private CommonCountService commonCountService;
 
+    @Autowired
+    private VendorIntroductionService vendorIntroductionService;
+
     /**
      * 获取已激活的通用计数器
      * @return
@@ -73,4 +78,24 @@ public class CommonCountController {
         return result;
     }
 
+    /**
+     * 获取B2C首页悬浮框的计数器
+     * @return
+     */
+    @RequestMapping(method = RequestMethod.GET)
+    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);
+        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/trade/vendor/controller/VendorIntroductionController.java

@@ -139,14 +139,4 @@ public class VendorIntroductionController {
 		return vendorIntroductionService.getRecommendVendor(pageable);
 	}
 
-    /**
-     * 获取供应商总数
-     *
-     * @return 有效供应商数量
-     */
-    @RequestMapping(value = "/vendor/count", method = RequestMethod.GET)
-    public ModelMap getVendorCount() {
-        return vendorIntroductionService.getVendorCount();
-    }
-
 }

src/main/java/com/uas/platform/b2c/trade/vendor/service/VendorIntroductionService.java

@@ -5,7 +5,6 @@ import com.uas.platform.b2c.prod.commodity.model.V_ProductPrivate;
 import com.uas.platform.b2c.trade.vendor.model.VendorIntroduction;
 import com.uas.sso.support.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.ui.ModelMap;
 
 /**
  * The interface VendorIntroduction service.
@@ -60,5 +59,5 @@ public interface VendorIntroductionService {
      * 获取有效供应商数量
      * @return 数量信息
      */
-    ModelMap getVendorCount();
+    Integer getVendorCount();
 }

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -16,7 +16,6 @@ import com.uas.sso.support.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
@@ -181,15 +180,12 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 	 * @return 数量信息
 	 */
 	@Override
-	public ModelMap getVendorCount() {
+	public Integer getVendorCount() {
 		Long enUU = 0L;
 		if (null != SystemSession.getUser() && null != SystemSession.getUser().getEnterprise()) {
 			enUU = SystemSession.getUser().getEnterprise().getUu();
 		}
-		Integer count = getTotalCount(enUU, null, null);
-		ModelMap map = new ModelMap();
-		map.put("count", count);
-		return map;
+		return getTotalCount(enUU, null, null);
 	}
 
 	/**