新增积分商城模块(新增商品   编辑商品  删除商品   商品列表)   修改活动人员统计为0   修改小程序活动报名报错
2个文件已修改
126 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11486,31 +11486,31 @@
     */
    @GetMapping("/VolunteerIntegralMerchant/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id);
//
//    /**
//     * 分页查询
//     * @param
//     * @return
//     */
//    @GetMapping("/VolunteerIntegralMerchant/queryList")
//    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
//                       @RequestParam("pageSize")  int pageSize,
//                       @RequestParam("name")  String name,
//                       @RequestParam("state")  String state);
//
//    /**
//     * 新增
//     * @param
//     * @return
//     */
//    @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
//    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);
//
//    @PostMapping("/VolunteerIntegralMerchant/updateById")
//    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
//
//    @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
//    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id);
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam("name")  String name,
                       @RequestParam("state")  String state);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);
    @PostMapping("/VolunteerIntegralMerchant/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
    @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -25,44 +25,44 @@
    @GetMapping("/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
    {
        return R.ok(merchantService.VolunteerIntegralMerchantQueryById(id));
        return merchantService.VolunteerIntegralMerchantQueryById(id);
    }
//
//    /**
//     * 分页查询
//     * @param
//     * @return
//     */
//    @GetMapping("/queryList")
//    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
//                       @RequestParam("pageSize")  int pageSize,
//                       @RequestParam("name")  String name,
//                       @RequestParam("state")  String state)
//    {
//        return R.ok(merchantService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state));
//    }
//
//    /**
//     * 新增
//     * @param
//     * @return
//     */
//    @PostMapping("/insertVolunteer")
//    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
//    {
//        return merchantService.VolunteerIntegralMerchantInsertVolunteer(vimVO);
//    }
//
//    @PostMapping("/updateById")
//    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
//    {
//        return merchantService.VolunteerIntegralMerchantUpdateById(vimVO);
//    }
//
//    @DeleteMapping("/deleteById")
//    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id)
//    {
//        return merchantService.VolunteerIntegralMerchantDeleteById(id);
//    }
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam("name")  String name,
                       @RequestParam("state")  String state)
    {
        return R.ok(merchantService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        return merchantService.VolunteerIntegralMerchantInsertVolunteer(vimVO);
    }
    @PostMapping("/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        return merchantService.VolunteerIntegralMerchantUpdateById(vimVO);
    }
    @DeleteMapping("/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id)
    {
        return merchantService.VolunteerIntegralMerchantDeleteById(id);
    }
}