新增积分商城模块(新增商品   编辑商品  删除商品   商品列表)   修改活动人员统计为0   修改小程序活动报名报错
3个文件已修改
42 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -248,25 +248,25 @@
     * @param id
     * @return
     */
//    @GetMapping("/VolunteerIntegralMerchant/queryById")
//    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
//    {
//        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(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)
//    {
//        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
//    }
    @GetMapping("/VolunteerIntegralMerchant/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(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)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
    }
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11510,7 +11510,7 @@
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
    @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id);
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
@@ -60,7 +60,7 @@
    }
    @DeleteMapping("/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id)
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam("id") String id)
    {
        return merchantService.VolunteerIntegralMerchantDeleteById(id);
    }