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

lidongdong

2023-08-29 dfe41d5fa39a2fc3c25689c2c6152ae8fa476bce

 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));
    }

    /**
@@ -81,6 +87,11 @@
        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }

        if(StringUtils.isEmpty(vimVO.getGoodNum()))
        {
            return R.fail("商品数量不能为空");
        }

        int num= merchantService.insertVolunteer(vimVO);
@@ -195,7 +206,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,
@@ -215,7 +226,7 @@
     * @param id
     * @return
     */
    @GetMapping("order/getData")
    @GetMapping("/order/getData")
    public R getData(@RequestParam("id") String id)
    {
        if(StringUtils.isEmpty(id))
@@ -240,7 +251,6 @@
        }

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