Merge remote-tracking branch 'origin/master'

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

@@ -147,5 +147,19 @@ public class SysCompanyController extends ApiBaseController {
     }
 
 
+    /**
+     * @descption: 统计平台商户入驻数量
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-03-11 11:07
+     */
+    @PostMapping("/countCompanyInfo")
+    public Object countCompanyInfo(){
+
+        int companyNum = companyService.countCompany();
+        return AjaxResult.success().putKV("companyNum",companyNum-1);
+    }
+
 
 }

dgtly-goods/dgtly-goods-api/src/main/java/com/dgtly/goods/controller/GoodsInfoController.java

@@ -76,4 +76,18 @@ public class GoodsInfoController extends ApiBaseController {
             return AjaxResult.error(ResultType.NUll);
         }
     }
+
+
+    /**
+     * @descption: 统计平台商品入驻数
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-03-11 11:18
+     */
+    @PostMapping("/countGoodsInfo")
+    public Object countGoodsInfo(){
+        int goodsNum = goodsInfoService.countGoodsInfo();
+        return AjaxResult.success().putKV("goodsNum",goodsNum);
+    }
 }

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/mapper/GoodsInfoMapper.java

@@ -92,4 +92,7 @@ public interface GoodsInfoMapper
      * @date: 2020/3/3 10:43
      */
     List<GoodsInfo> selectGoodsInfoByIds(String[] ids);
+
+
+    public int countGoodsInfo();
 }

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/service/IGoodsInfoService.java

@@ -93,4 +93,6 @@ public interface IGoodsInfoService
      * @date: 2020/3/3 10:43
      */
     public List<GoodsInfo> selectGoodsInfoByIds(String ids);
+
+    public int countGoodsInfo();
 }

dgtly-goods/dgtly-goods-common/src/main/java/com/dgtly/goods/service/impl/GoodsInfoServiceImpl.java

@@ -205,5 +205,8 @@ public class GoodsInfoServiceImpl implements IGoodsInfoService
         }
     }
 
-
+    @Override
+    public int countGoodsInfo() {
+        return goodsInfoMapper.countGoodsInfo();
+    }
 }

dgtly-goods/dgtly-goods-common/src/main/resources/mapper/goods/GoodsInfoMapper.xml

@@ -243,4 +243,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by gi.putaway_flag ,gi.create_time
     </select>
+
+
+    <select id="countGoodsInfo" resultType="java.lang.Integer">
+        select count(name) from goods_info where del_flag = 0
+    </select>
 </mapper>

dgtly-member/dgtly-member-api/src/main/java/com/dgtly/member/controller/MemberInfoController.java

@@ -155,4 +155,22 @@ public class MemberInfoController extends ApiBaseController {
         int flag = iMemberInfoService.updateMemberInfo(memberInfo);
         return toAjax(flag);
     }
+
+
+
+    /**
+     * @descption: 统计平台会员注册数量
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-03-11 10:36
+     */
+    @ApiPassToken
+    @PostMapping("/countMemberInfo")
+    public Object countMemberInfo(){
+        int memberNum = iMemberInfoService.countMemberInfo();
+        return AjaxResult.success().putKV("memberNum",memberNum);
+
+    }
+
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/member/mapper/MemberInfoMapper.java

@@ -86,4 +86,13 @@ public interface MemberInfoMapper
      * @date: 2020-2-25 15:39
      */
     public MemberInfo memberLogin(MemberInfo memberInfo);
+
+    /**
+     * @descption: 统计平台会员注册数量
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-03-11 10:47
+     */
+    public int countMemberInfo();
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/member/service/IMemberInfoService.java

@@ -85,4 +85,14 @@ public interface IMemberInfoService
       * @date: 2020-2-25 15:39
       */
     public MemberInfo memberLogin(MemberInfo info);
+
+
+    /**
+     * @descption: 统计平台会员注册量
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-03-11 10:46
+     */
+    public int countMemberInfo();
 }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/member/service/impl/MemberInfoServiceImpl.java

@@ -112,4 +112,9 @@ public class MemberInfoServiceImpl implements IMemberInfoService
     public MemberInfo memberLogin(MemberInfo info) {
         return memberInfoMapper.memberLogin(info);
     }
+
+    @Override
+    public int countMemberInfo() {
+        return memberInfoMapper.countMemberInfo();
+    }
 }

dgtly-member/dgtly-member-common/src/main/resources/mapper/member/MemberInfoMapper.xml

@@ -106,4 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           select id, login_account, login_password
           from member_info where (login_account = #{loginAccount} or phone = #{phone}) and login_password = #{loginPassword}
     </select>
+
+    <select id="countMemberInfo" resultType="java.lang.Integer">
+        select COUNT(login_account) as memberNum from member_info where del_flag=0
+    </select>
 </mapper>

dgtly-member/dgtly-member-common/src/main/resources/mapper/notice/NoticeDemandMapper.xml

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="getDemandInfoTenList" resultMap="NoticeDemandResult">
         select id, member_id, purchase_title,release_time from notice_demand
-        order by release_time desc limit 0,10
+        order by release_time desc limit 0,6
 
     </select>
 

dgtly-member/dgtly-member-common/src/main/resources/mapper/notice/NoticeSupplyMapper.xml

@@ -152,7 +152,7 @@ FROM
         supply_title,
         release_time
         from notice_supply
-        order by release_time desc limit 0,10
+        order by release_time desc limit 0,6
 
     </select>
 

dgtly-system/src/main/java/com/dgtly/system/mapper/SysCompanyMapper.java

@@ -73,4 +73,8 @@ public interface SysCompanyMapper
      * @date: 2020-2-25
      */
     List<SysCompany> selectSysCompanyListExRoot(SysCompany sysCompany);
+
+
+
+    public int countCompany();
 }

dgtly-system/src/main/java/com/dgtly/system/service/ISysCompanyService.java

@@ -113,4 +113,13 @@ public interface ISysCompanyService
      * @date: 2020-2-25
      */
     public int allowEdit(CompanyExamine companyExamine);
+
+    /**
+     * @descption: 统计平台商户注册数量
+     * @param:
+     * @return:
+     * @auther: LiuLingChao
+     * @date: 2020-03-11 11:10
+     */
+    public int countCompany();
 }

dgtly-system/src/main/java/com/dgtly/system/service/impl/SysCompanyServiceImpl.java

@@ -323,4 +323,9 @@ public class SysCompanyServiceImpl implements ISysCompanyService
         result.setPrimaryBusiness(cr.getPrimaryBusiness());
         return result;
     }
+
+    @Override
+    public int countCompany() {
+        return sysCompanyMapper.countCompany();
+    }
 }

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

@@ -151,5 +151,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%',#{companyName},'%') </if>
         </where>
     </select>
+
+
+    <select id="countCompany" resultType="java.lang.Integer">
+
+        select count(company_name) from sys_company where del_flag =0
+    </select>
     
 </mapper>