lidongdong
2023-11-23 6152a06b1de691d8852892826a9e02e745adef5a
花城优化  商家搜索用户接口
7个文件已修改
66 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java
@@ -378,6 +378,10 @@
    public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item);
    @GetMapping("/FightConvenient/selectUserList")
    public R selectUserList(@RequestParam("communityId") String communityId,
                            @RequestParam("phoneOrname") String phoneOrname);
    /*****************************************************************************************************
     *
     *                                       用户积分任务完成情况
@@ -514,9 +518,6 @@
     */
    @GetMapping("/NeedProblem/timedNewFightNeedProblemInventoryHandler")
    public R timedNewFightNeedProblemInventoryHandler();
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -335,7 +336,12 @@
        return newStriveForFeign.editMerchantData(item);
    }
    @ApiOperation(value = "搜索用户", response = SysUserVO.class)
    @GetMapping("/selectUserList")
    public R selectUserList(@RequestParam("phoneOrname") String phoneOrname)
    {
        return newStriveForFeign.selectUserList(getCommunityId()+"",phoneOrname);
    }
    /*******************************************************************************************************************
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java
@@ -5,6 +5,7 @@
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import com.panzhihua.service_dangjian.service.NewFightConvenientMerchantService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -79,4 +80,13 @@
        return merchantService.editData(item);
    }
    @GetMapping("/selectUserList")
    public R selectUserList(@RequestParam("communityId") String communityId,
                            @RequestParam("phoneOrname") String phoneOrname)
    {
        return merchantService.selectUserList(communityId,phoneOrname);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightConvenientMerchantDao.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import io.swagger.annotations.ApiModelProperty;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * @title: ConvenientMerchantDAO
@@ -63,4 +66,7 @@
    int editData(@Param("item") NewFightConvenientMerchantVO item);
    List<SysUserVO> selectUserList(@Param("communityId") String communityId,
                                   @Param("phoneOrname") String phoneOrname);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java
@@ -2,7 +2,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -57,4 +61,7 @@
    R editData(NewFightConvenientMerchantVO item);
    R selectUserList(String communityId,String phoneOrname);
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightConvenientMerchantServiceImpl.java
@@ -74,4 +74,9 @@
        return R.fail("操作失败");
    }
    @Override
    public R selectUserList(String communityId, String phoneOrname) {
        return R.ok(baseMapper.selectUserList(communityId,phoneOrname));
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewFightComConvenientMerchantsMapper.xml
@@ -269,4 +269,27 @@
        where id = #{item.id}
    </update>
    <select id="selectUserList" resultType="com.panzhihua.common.model.vos.user.SysUserVO">
        select su.user_id,su.phone,su.nick_name,su.name,su.community_id from sys_user as su
        <where>
            1=1
            <if test="communityId!=null and communityId !='' ">
                and su.community_id=#{communityId}
            </if>
            <if test="phoneOrname!=null and phoneOrname !=''">
                and (su.name like concat ('%',#{phoneOrname},'%') or
                su.phone like concat ('%',#{phoneOrname},'%') or
                su.nick_name like concat ('%',#{phoneOrname},'%')
                )
            </if>
        </where>
    </select>
</mapper>