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

huanghongfa

2021-05-08 ac56d448846892223ec1107a9dc1bfbfa3464c71

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

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

@@ -91,7 +91,7 @@
    @ApiOperation(value = "查询便民服务商家详情")
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return communityService.getComCvtBusiness(id);
        return communityService.getComCvtBusiness(id, null);
    }



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

@@ -1218,7 +1218,7 @@
     * @return 返回结果
     */
    @GetMapping("/convenient/business/get")
    R getComCvtBusiness(@RequestParam("id") Long id);
    R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode);

    /**
     * 删除便民服务商家信息

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

@@ -107,7 +107,8 @@
    @ApiOperation(value = "查询便民服务商家详情")
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return communityService.getComCvtBusiness(id);
        String cityCode = "510400";
        return communityService.getComCvtBusiness(id, cityCode);
    }

    @ApiOperation(value = "删除便民服务商家详情")

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

@@ -84,11 +84,12 @@
     * 查询便民服务商家详情
     *
     * @param id 商家主键
     * @param cityCode 城市编码
     * @return 返回结果
     */
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return comCvtBusinessService.getComCvtBusiness(id);
    public R getComCvtBusiness(@RequestParam("id") Long id, @RequestParam("cityCode") String cityCode) {
        return comCvtBusinessService.getComCvtBusiness(id, cityCode);
    }

    /**

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

@@ -36,9 +36,11 @@

    /**
     * 查询便民服务商家详情
     * @param id 商家主键
     * @param cityCode 城市编码
     * @return
     */
    R getComCvtBusiness(Long id);
    R getComCvtBusiness(Long id, String cityCode);

    /**
     * 删除便民服务商家信息

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,9 +25,11 @@
import com.panzhihua.service_community.service.ComCvtBusinessService;
import com.panzhihua.service_community.service.ComCvtServeService;
import org.springframework.beans.BeanUtils;
import org.springframework.boot.util.LambdaSafe;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -143,7 +146,7 @@
    }

    @Override
    public R getComCvtBusiness(Long id) {
    public R getComCvtBusiness(Long id, String cityCode) {
        ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id);
        if (null == comCvtBusinessDO) {
            return R.fail("商家不存在");
@@ -153,11 +156,19 @@
        List<ComActDO> comActDOS = new ArrayList<>();

        if(comCvtBusinessDO.getAreaFlag()==1){
            comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState,0));
            LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0);
            if(!StringUtils.isEmpty(cityCode)){
                lambdaQueryWrapper.eq(ComActDO::getCityCode, cityCode);
            }
            comActDOS = comActDAO.selectList(lambdaQueryWrapper);
        }else{
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
            if(!ObjectUtils.isEmpty(areaIds)){
                comActDOS = comActDAO.selectBatchIds(areaIds);
                List<ComActDO> busiDO = comActDAO.selectBatchIds(areaIds);
                if(!StringUtils.isEmpty(cityCode) && busiDO!=null && busiDO.size()>0){
                    comActDOS = busiDO.stream().filter(comActDO -> cityCode.equals(comActDO.getCityCode()))
                            .collect(Collectors.toList());
                }
            }
        }


 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -507,7 +507,7 @@
            return R.fail("未找到党员认证信息");
        }
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        if(partyBuildingMemberVO.getAuditResult().equals(3)){
        if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(3)){
            comPbMemberDO.setRefuseReason(partyBuildingMemberVO.getRefuseReason());
        }
        if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){