新增商家详情接口 修改查询用户信息报错

lidongdong

2023-08-29 dfe41d5fa39a2fc3c25689c2c6152ae8fa476bce

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

@@ -11334,7 +11334,8 @@
     */
    @GetMapping("/VolunteerType/volunteerTypeGetList")
    public R volunteerTypeGetList(@RequestParam("pageNum")  int pageNum,
                                  @RequestParam("pageSize")  int pageSize);
                                  @RequestParam("pageSize")  int pageSize,
                                  @RequestParam("type")   String type);

    /**
     * 新增
@@ -11494,7 +11495,9 @@
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam(value = "name", required = false) String name,
                       @RequestParam(value = "state", required = false) String state);
                       @RequestParam(value = "state", required = false) String state,
                        @RequestParam(value = "goodType", required = false) String goodType,
                        @RequestParam(value = "merchantId", required = false) String merchantId);

    /**
     * 新增
@@ -11528,7 +11531,7 @@
     * @param
     * @return
     */
    @GetMapping("order/getList")
    @GetMapping("/VolunteerIntegralMerchant/order/getList")
    public R getList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize")  int pageSize,
                     @RequestParam(value = "goodsId", required = false) String goodsId,
@@ -11544,7 +11547,7 @@
     * @param id
     * @return
     */
    @GetMapping("order/getData")
    @GetMapping("/VolunteerIntegralMerchant/order/getData")
    public R getData(@RequestParam("id") String id);

    /**
@@ -11552,7 +11555,7 @@
     * @param
     * @return
     */
    @PostMapping("/order/insertData")
    @PostMapping("/VolunteerIntegralMerchant/order/insertData")
    public R insertData(@RequestBody VolunteerCreditsExchangeVO item);

    /**
@@ -11560,7 +11563,7 @@
     * @param item
     * @return
     */
    @PostMapping("/order/update")
    @PostMapping("/VolunteerIntegralMerchant/order/update")
    public R update(@RequestBody VolunteerCreditsExchangeVO item);

    /**
@@ -11568,7 +11571,7 @@
     * @param id
     * @return
     */
    @DeleteMapping("/order/delete")
    @DeleteMapping("/VolunteerIntegralMerchant/order/delete")
    public R delete(@RequestParam("id") String id);

    /**
@@ -11576,10 +11579,52 @@
     * @param id
     * @return
     */
    @GetMapping("/order/conditionData")
    @GetMapping("/VolunteerIntegralMerchant/order/conditionData")
    public R conditionData(@RequestParam("id") String id);

    /*****************************************************************************************************************
     *
     *
     *                        路北社区商家管理
     *
     *
     *****************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerMerchant/getList")
    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
                                      @RequestParam("pageSize") int pageSize,
                                      @RequestParam(value = "merchantState", required = false) String merchantState,
                                      @RequestParam(value = "merchantType", required = false) String merchantType,
                                      @RequestParam(value = "name", required = false) String name,
                                      @RequestParam(value = "communityId", required = false) String communityId);

    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerMerchant/insert")
    public R insertVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);


    @PostMapping("/VolunteerMerchant/update")
    public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo);


    @DeleteMapping("/VolunteerMerchant/delete")
    public R deleteVolunteerMerchant(@RequestParam("pageNum") String id);

    @GetMapping("/VolunteerMerchant/getUser")
    public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
                                      @RequestParam(value = "userName", required = false) String userName,
                                      @RequestParam(value = "userPhone", required = false)String userPhone);


    @GetMapping("/getById")
    public R volunteerMerchantGetById(@RequestParam("id") String id);

}