Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

huanghongfa

2022-04-19 d89d4a28653657528dc0718f1aa55e1c84ad1e6f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComBatteryCommodityOrderCollageTeamMapper.xml

@@ -65,9 +65,6 @@
            <if test="dto.orderNo != null and dto.orderNo != ''">
                and cbcoot.order_no = #{dto.orderNo}
            </if>
            <if test="dto.userId != null">
                and cbcoot.user_id = #{dto.userId}
            </if>
            <if test="dto.status != null">
                and cbcoot.status = #{dto.status}
            </if>
@@ -116,5 +113,15 @@
        order by cbcoot.create_at desc
    </select>

    <select id="getUserCollageDetail" resultType="map">
        SELECT
            count( id ) as ktCount,
            (select count(id) from com_battery_commodity_order_collage_team_people where team_id = #{teamId} and user_id = #{userId} and `type` = 2) as ptCount
        FROM
            com_battery_commodity_order_collage_team_people
        WHERE
            team_id = #{teamId} AND head_user_id = #{userId}
    </select>

</mapper>