Merge branch 'master' of http://git.dgtis.com/qxp/SteelfurnitureManager

dgtly-api/src/main/java/com/dgtly/api/controller/SysCompanyController.java

@@ -11,8 +11,10 @@ import com.dgtly.companyext.domain.CompanyHonour;
 import com.dgtly.companyext.domain.CompanyReviewed;
 import com.dgtly.companyext.service.ICompanyHonourService;
 import com.dgtly.companyext.service.ICompanyReviewedService;
+import com.dgtly.goods.service.IGoodsInfoService;
 import com.dgtly.member.domain.MemberFollow;
 import com.dgtly.member.service.IMemberFollowService;
+import com.dgtly.member.service.IMemberInfoService;
 import com.dgtly.system.domain.SysCompany;
 import com.dgtly.system.service.ISysCompanyService;
 import com.dgtly.system.service.ISysDictDataService;
@@ -47,6 +49,10 @@ public class SysCompanyController extends ApiBaseController {
     private ICompanyHonourService companyHonourService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Autowired
+    private IMemberInfoService memberInfoService;
+    @Autowired
+    private IGoodsInfoService goodsInfoService;
 
     @ApiOperation(value = "商家详情")
     @ApiImplicitParam(name = "params" , paramType = "body")
@@ -158,7 +164,9 @@ public class SysCompanyController extends ApiBaseController {
     public Object countCompanyInfo(){
 
         int companyNum = companyService.countCompany();
-        return AjaxResult.success().putKV("companyNum",companyNum-1);
+        int memberNum = memberInfoService.countMemberInfo();
+        int goodsNum = goodsInfoService.countGoodsInfo();
+        return AjaxResult.success().putKV("companyNum",companyNum-1).putKV("memberNum",memberNum).putKV("goodsNum",goodsNum);
     }
 
 

dgtly-system/src/main/resources/mapper/system/SysCompanyMapper.xml

@@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select sc.id, sc.company_name,sc.establish_date,sc.default_img_url,sc.primary_business,sc.propaganda_img_url
         from sys_company sc
         where sc.id != 1 and sc.status = 0
-        limit 0,5
+        limit 0,10
     </select>
     <select id="selectSysCompanyListExRoot" parameterType="SysCompany" resultMap="SysCompanyResult">
         <include refid="selectSysCompanyVo"/>