修改后台社区动态加载不出来

lidongdong

2023-09-04 b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java

@@ -15,6 +15,10 @@

import javax.annotation.Resource;


/**
 * 商品内容逻辑
 */
@Slf4j
@RestController
@RequestMapping("/VolunteerIntegralMerchant")
@@ -43,10 +47,12 @@
    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)
    {
        Page page=new Page<VolunteerIntegralMerchant>(pageNum,pageSize);
        return R.ok(merchantService.queryList(page,name,state));
        return R.ok(merchantService.queryList(page,name,state,goodType,merchantId));
    }

    /**
@@ -78,10 +84,7 @@
            return R.fail("商品所需积分不能为空");
        }

        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }


        int num= merchantService.insertVolunteer(vimVO);
        if(num>0)
@@ -111,20 +114,9 @@
            vimVO.setCommunityId(getCommunityId()+"");
        }

        if(StringUtils.isEmpty(vimVO.getName()))
        {
            return R.fail("商品名称不能为空");
        }


        if(StringUtils.isEmpty(vimVO.getIntegral()))
        {
            return R.fail("商品所需积分不能为空");
        }

        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }

        int num= merchantService.updateById(vimVO);
@@ -152,7 +144,7 @@

        if(StringUtils.isEmpty(vimVO.getState()))
        {
            return R.fail("商品上下架状态不能为空");
            vimVO.setState("1");
        }

        if(StringUtils.isEmpty(vimVO.getCommunityId()))
@@ -195,7 +187,7 @@
     * @param
     * @return
     */
    @GetMapping("order/getList")
    @GetMapping("/order/getList")
    public R getList(@RequestParam("pageNum") int pageNum,
                     @RequestParam("pageSize")  int pageSize,
                     @RequestParam(value = "goodsId", required = false) String goodsId,
@@ -204,10 +196,11 @@
                     @RequestParam(value = "condition", required = false) String condition,
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "userId", required = false) String userId)
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "orderType", required = false) String orderType)
    {
        return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,userId);
                condition,userName,communityId,userId,orderType);
    }

    /**
@@ -215,7 +208,7 @@
     * @param id
     * @return
     */
    @GetMapping("order/getData")
    @GetMapping("/order/getData")
    public R getData(@RequestParam("id") String id)
    {
        if(StringUtils.isEmpty(id))
@@ -240,8 +233,25 @@
        }

        item.setUserId(userInfoVO.getUserId()+"");
        item.setNeedScore(userInfoVO.getLoveIntegral());
        return vceService.insertData(item);
    }

    /**
     * 新增用户购买商家商品记录
     * @param
     * @return
     */
    @PostMapping("/order/insertMerchantData")
    public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item)
    {
        LoginUserInfoVO userInfoVO= getLoginUserInfo();
        if(StringUtils.isEmpty(item.getCommunityId()))
        {
            item.setCommunityId(userInfoVO.getCommunityId()+"");
        }

        item.setUserId(userInfoVO.getUserId()+"");
        return vceService.insertMerchantData(item);
    }

    /**
@@ -286,4 +296,21 @@
    }



    /**
     * 社区取消订单
     * @param id
     * @return
     */
    @GetMapping("/order/communityCancellation")
    public R communityCancellation(@RequestParam("id") String id)
    {
        if(StringUtils.isEmpty(id))
        {
            return R.fail("订单id不能为空");
        }
        return vceService.communityCancellation(id);
    }


}