仁和区bug提交

101captain

2022-01-21 94782e82d05ae42e3fd59be93668b48bbb114a15

仁和区bug提交

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java

@@ -69,7 +69,7 @@
        if (Objects.isNull(communityId)) {
            return R.fail("社区id不能为空");
        }
        return communityService.getSuitableServiceCategories(communityId);
        return communityService.getSuitableServiceCategories(communityId,this.getAreaCode());
    }

    @ApiOperation(value = "分页获取热门商家", response = ConvenientMerchantVO.class)

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -6493,7 +6493,7 @@
     * @return
     */
    @GetMapping("/convenient/service-category/suitable")
    R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);
    R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);

    /**
     * 获取该社区下的热门商家

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -584,8 +584,8 @@
     * @return
     */
    @GetMapping("/service-category/suitable")
    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId) {
        return convenientServiceCategoryService.getSuitableServiceCategories(communityId);
    public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode) {
        return convenientServiceCategoryService.getSuitableServiceCategories(communityId,areaCode);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientServiceCategoryDAO.java

@@ -73,5 +73,5 @@
     * @param communityId
     * @return
     */
    List<ConvenientServiceCategoryVO> selectSuitableServiceCategories(@Param("communityId") Long communityId);
    List<ConvenientServiceCategoryVO> selectSuitableServiceCategories(@Param("communityId") Long communityId,@Param("areaCode")String areaCode);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientServiceCategoryService.java

@@ -61,5 +61,5 @@
     * @param communityId
     * @return
     */
    R getSuitableServiceCategories(Long communityId);
    R getSuitableServiceCategories(Long communityId,String areaCode);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientServiceCategoryServiceImpl.java

@@ -120,7 +120,7 @@
    }

    @Override
    public R getSuitableServiceCategories(Long communityId) {
        return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId));
    public R getSuitableServiceCategories(Long communityId,String areaCode) {
        return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId,areaCode));
    }
}

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

@@ -53,6 +53,6 @@
        FROM com_convenient_service_categories ccsc
        INNER JOIN com_convenient_service_scope ccss ON ccsc.id = ccss.service_category_id
        INNER JOIN com_convenient_merchants ccm ON ccss.merchant_id = ccm.id
        WHERE ccsc.is_del = 0 AND ccm.is_del = 0 AND( ccm.community_id = ${communityId} or ccm.community_id =0) AND ccm.business_status = 1 GROUP BY ccsc.id ORDER BY ccsc.weight desc
        WHERE ccsc.is_del = 0 AND ccm.is_del = 0 AND( ccm.community_id = ${communityId} or ccm.community_id =0) and ccsc.area_code = #{areaCode} AND ccm.business_status = 1 GROUP BY ccsc.id ORDER BY ccsc.weight desc
    </select>
</mapper>