仁和区Bug代码提交

101captain

2022-01-21 b0839d21362aec0dcdbd00e3d0d56ceb368a86ab

仁和区Bug代码提交

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

@@ -39,7 +39,6 @@
    @ApiOperation(value = "根据距离搜索社区", response = CommunitySwitchAllAppletsVO.class)
    @PostMapping("/distance/noToken")
    public R searchDistance(@RequestBody SearchCommunityDTO communityDTO) {
        communityDTO.setAreaCode(this.getAreaCode());
        return communityService.communitySwitchSearchDistanceList(communityDTO);
    }


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

@@ -377,6 +377,6 @@
    @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class)
    @GetMapping("easyphoto/classify/list")
    public R easyPhotoClassifyList() {
        return communityService.listPhotoClassify();
        return communityService.listPhotoClassify(this.getAreaCode());
    }
}

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

@@ -364,6 +364,6 @@
    @ApiOperation(value = "所有服务分类", response = ConvenientServiceCategoryVO.class)
    @GetMapping("/service-category/all")
    public R getAllServiceCategories() {
        return communityService.getAllServiceCategories();
        return communityService.getAllServiceCategories(this.getAreaCode());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java

@@ -2,6 +2,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.utlis.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -33,7 +34,23 @@
    @GetMapping("info")
    public R getUserInfo() {
        Long userId = this.getUserId();
        return userService.detailUser(userId);
        R r=userService.detailUser(userId);
        if(r.getData()!=null){
            LoginUserInfoVO loginUserInfoVO= (LoginUserInfoVO) r.getData();
            if(StringUtils.isNotEmpty(loginUserInfoVO.getAreaCode())){
                switch (loginUserInfoVO.getAreaCode()){
                    case "510423": loginUserInfoVO.setCommunityName("西区运营后台");
                    break;
                    case "510411": loginUserInfoVO.setCommunityName("仁和区运营后台");
                    break;
                    case "510402": loginUserInfoVO.setCommunityName("东区运营后台");
                    break;
                    default:loginUserInfoVO.setCommunityName("运营后台");
                }
            }
            return R.ok(loginUserInfoVO);
        }
        return R.fail("无用户信息");
    }

    @ApiOperation(value = "修改密码")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveAdminDTO.java

@@ -38,4 +38,6 @@
    private Long communityId;

    private String areaCode;

    private Integer isWjw;
}

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

@@ -5533,7 +5533,7 @@
     * @return 随手拍分类列表
     */
    @GetMapping("/classify/admin/list")
    R listPhotoClassify();
    R listPhotoClassify(@RequestParam("areaCode") String areaCode);

    /**
     * 社区后台-切换随手拍公示状态
@@ -6372,7 +6372,7 @@
     * @return
     */
    @GetMapping("/convenient/service-category/all")
    R getAllServiceCategories();
    R getAllServiceCategories(@RequestParam("areaCode") String areaCode);

    /**
     * 获取用户便民服务商家详情

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

@@ -287,7 +287,7 @@
    @ApiOperation(value = "所有服务分类", response = ConvenientServiceCategoryVO.class)
    @GetMapping("/service-category/all")
    public R getAllServiceCategories() {
        return communityService.getAllServiceCategories();
        return communityService.getAllServiceCategories(this.getAreaCode());
    }

    @ApiOperation(value = "便民服务商家导出")

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

@@ -433,8 +433,8 @@
     * @return
     */
    @GetMapping("/service-category/all")
    public R getAllServiceCategories() {
        return convenientServiceCategoryService.getAllServiceCategories();
    public R getAllServiceCategories(@RequestParam("areaCode") String areaCode) {
        return convenientServiceCategoryService.getAllServiceCategories(areaCode);
    }

    /**

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

@@ -72,8 +72,8 @@
     * @return 随手拍分类列表
     */
    @GetMapping("/admin/list")
    public R listPhotoClassify() {
        return comActEasyPhotoClassifyService.listPhotoClassify();
    public R listPhotoClassify(@RequestParam("areaCode")String areaCode) {
        return comActEasyPhotoClassifyService.listPhotoClassify(areaCode);
    }

    /**

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

@@ -35,6 +35,6 @@
     * 
     * @return 随手拍分类列表
     */
    List<ComActEasyPhotoClassifyVO> getPhotoClassifyList();
    List<ComActEasyPhotoClassifyVO> getPhotoClassifyList(String areaCode);

}

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

@@ -53,7 +53,7 @@
     * 
     * @return 随手拍分类列表
     */
    R listPhotoClassify();
    R listPhotoClassify(String areaCode);

    /**
     * 运营后台-随手拍分类删除

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

@@ -54,7 +54,7 @@
     * 获取所有便民服务分类
     * @return
     */
    R getAllServiceCategories();
    R getAllServiceCategories(String areaCode);

    /**
     * 获取该社区商家数量大于0的分类

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

@@ -112,8 +112,8 @@
     * @return 随手拍分类列表
     */
    @Override
    public R listPhotoClassify() {
        return R.ok(this.baseMapper.getPhotoClassifyList());
    public R listPhotoClassify(String areaCode) {
        return R.ok(this.baseMapper.getPhotoClassifyList(areaCode));
    }

    /**

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

@@ -101,6 +101,7 @@
                }
                if(comActReserveCommitVO.getRecordId()!=null){
                    comActReserveRecordMapper.deleteById(comActReserveCommitVO.getRecordId());
                    comActReserveDO.setJoinCount(comActReserveDO.getJoinCount()-1);
                }
                List<ComActReserveRecordDO> list=comActReserveRecordMapper.selectList(new QueryWrapper<ComActReserveRecordDO>().eq("reserve_id",comActReserveCommitVO.getId()).eq("user_id",comActReserveCommitVO.getUserId()).in("status",1,2,3));
                if(!list.isEmpty()&&list.size()>1&&comActReserveDO.getIsRepeat()==ComActReserveDO.isRepeat.no){

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

@@ -105,10 +105,10 @@
    }

    @Override
    public R getAllServiceCategories() {
    public R getAllServiceCategories(String areaCode) {
        List<ConvenientServiceCategoryVO> categoryVOList = new ArrayList<>();
        List<ConvenientServiceCategoryDO> categoryDOS = this.baseMapper.selectList(new QueryWrapper<ConvenientServiceCategoryDO>()
                .lambda().orderByDesc(ConvenientServiceCategoryDO::getWeight));
                .lambda().eq(ConvenientServiceCategoryDO::getAreaCode,areaCode).orderByDesc(ConvenientServiceCategoryDO::getWeight));
        if (!ObjectUtils.isEmpty(categoryDOS)) {
            categoryDOS.forEach(categoryDO -> {
                ConvenientServiceCategoryVO categoryVO = new ConvenientServiceCategoryVO();

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

@@ -32,7 +32,7 @@
    </select>

    <select id="getPhotoClassifyList" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO">
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify where area_code = #{areaCode}
        order by create_at desc
    </select>


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

@@ -109,6 +109,9 @@
                <if test="pageReserveDTO.endTime != null and pageReserveDTO.endTime != &quot;&quot;">
                    AND DATE_FORMAT(t.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{pageReserveDTO.endTime}
                </if>
                <if test="pageReserveDTO.isWjw !=null">
                    AND (title like '%返攀%' or '%居家%')
                </if>
            </where>
            order by t.create_at desc
    </select>

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

@@ -52,7 +52,7 @@
        SELECT ccsc.id, ccsc.name, ccsc.icon, ccsc.remark, ccsc.weight
        FROM com_convenient_service_categories ccsc
        INNER JOIN com_convenient_service_scope ccss ON ccsc.id = ccss.service_category_id
        LEFT JOIN com_convenient_merchants ccm ON ccss.merchant_id = ccm.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
    </select>
</mapper>

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

@@ -170,7 +170,7 @@
    @ApiOperation(value = "所有服务分类", response = ConvenientServiceCategoryVO.class)
    @GetMapping("/service-category/all")
    public R getAllServiceCategories() {
        return communityService.getAllServiceCategories();
        return communityService.getAllServiceCategories(this.getAreaCode());
    }

    @ApiOperation(value = "编辑便民服务商家")