Merge branch 'test_warehouse' into test

101captain

2021-10-15 9bfe692752f1dc1a2a0c0c825a88335de30b92f6

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -6,6 +6,8 @@

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.*;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -69,8 +71,12 @@

    List<DataKanbanDTO> selectCommunityUserOrder();

    List<DataKanbanDTO> selectCommunityUserOrderMonth();


    DataKanbanDTO selectCommunityActiveUserOrder(Date date1);

    DataKanbanDTO selectCommunityAddUserOrder(Date date1);


    IndexDataVO indexDataCommunityBackstage(Long communityId);
@@ -166,4 +172,24 @@

    int putUserTag(@Param("sysUserDO") SysUserDO sysUserDO);

    /**
     * 禁用/启用便民服务商家账号
     * @param status
     * @param userIds
     * @return
     */
    int disableOrEnableMerchantUsers(@Param("status") Integer status, @Param("userIds") List<Long> userIds);

    /**
     * 根据手机号维护社区团队表是否注册
     * @param phone 手机号
     */
    void judgeCommunityTeam(@Param("phone") String phone);

    /**
     * 根据手机号查询社区团队表中用户数量
     * @param phone 手机号
     * @return  用户数量
     */
    Integer getCommunityTeamCount(@Param("phone") String phone);
}