lidongdong
2023-08-29 b6ad75c0a5caf02e6f2a4a1f35deddf339c793d5
新增商家详情接口   修改查询用户信息报错
7个文件已修改
58 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerMerchantDao.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11623,4 +11623,8 @@
                                      @RequestParam("pageNum") String userName,
                                      @RequestParam("pageNum") String userPhone);
    @GetMapping("/getById")
    public R volunteerMerchantGetById(@RequestParam("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerMerchantApi.java
@@ -71,6 +71,13 @@
        return R.ok(vtService.volunteerMerchantGetUser(getCommunityId()+"",userName,userPhone));
    }
    @GetMapping("/getById")
    public R volunteerMerchantGetById(@RequestParam("id") String id)
    {
        return vtService.volunteerMerchantGetById(id);
    }
    /******************************************************************************************************
     *
     *
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
@@ -17,13 +17,21 @@
    @Resource
    private VolunteerMerchantService vtService;
    @GetMapping("/getById")
    public R volunteerMerchantGetById(@RequestParam("id") String id)
    {
        return vtService.getById(id);
    }
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
    public R volunteerMerchantGetList( int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "merchantState", required = false) String merchantState,
                                      @RequestParam(value = "merchantType", required = false) String merchantType,
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerMerchantDao.java
@@ -11,9 +11,16 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface VolunteerMerchantDao extends BaseMapper<VolunteerMerchant>
{
    VolunteerMerchant getById(@Param("id") String id);
    /**
     * 分页查询
     * @param
@@ -43,9 +50,9 @@
     * @param
     * @return
     */
    SysUser getUser(@Param("communityId") String communityId,
                    @Param("userName") String userName,
                    @Param("userPhone") String userPhone);
    List<SysUser> getUser(@Param("communityId") String communityId,
                          @Param("userName") String userName,
                          @Param("userPhone") String userPhone);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java
@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
import com.panzhihua.service_community.entity.SysUser;
import com.panzhihua.service_community.entity.VolunteerMerchant;
public interface VolunteerMerchantService extends IService<VolunteerMerchant>
{
    R getById(String id);
    /**
     * 分页查询
     * @param
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerMerchantServiceImpl.java
@@ -21,7 +21,16 @@
@Slf4j
@Service
public class VolunteerMerchantServiceImpl extends ServiceImpl<VolunteerMerchantDao,
        VolunteerMerchant> implements VolunteerMerchantService {
        VolunteerMerchant> implements VolunteerMerchantService
{
    @Override
    public R getById(String id) {
        return R.ok(baseMapper.getById(id));
    }
    @Override
    public R volunteerMerchantGetList(int pageNum, int pageSize, String merchantState,
                                      String merchantType, String name, String communityId) {
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerMerchantMapper.xml
@@ -56,6 +56,14 @@
    </sql>
    <select id="getById" resultMap="VolunteerMerchantMap">
        select <include refid="beas_sql"/>
        from volunteer_merchant
        where volunteer_merchant.id=#{id}
    </select>
    <!-- 分页查询 -->
    <select id="getList" resultMap="VolunteerMerchantMap">
        select <include refid="beas_sql"/>