2修改商家订单列表

lidongdong

2023-09-06 1d733521bb56907723e63f33c480e4788281e964

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java

@@ -99,14 +99,15 @@
                                  @RequestParam(value = "condition", required = false) String condition,
                                  @RequestParam(value = "userName", required = false) String userName,
                                  @RequestParam(value = "communityId", required = false) String communityId,
                                  @RequestParam(value = "orderType", required = false) String orderType)
                                  @RequestParam(value = "orderType", required = false) String orderType,
                                  @RequestParam(value = "merchantId", required = false) String merchantId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }
        return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,getUserId()+"",orderType);
                condition,userName,communityId,getUserId()+"",orderType,merchantId);
    }

    /**
@@ -481,6 +482,30 @@
        return communityService.WithdrawInsert(item);
    }

    /**
     * 商家提现列表
     * @param disposeType
     * @return
     */
    @GetMapping("/withdraw/getList")
    public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "disposeType", required = false) String disposeType,
                             @RequestParam(value = "merchantName", required = false) String merchantName,
                             @RequestParam(value = "merchantId", required = false) String  merchantId,
                             @RequestParam(value = "communityId", required = false) String communityId)
    {
        if(StringUtils.isEmpty(communityId))
        {
            communityId=getCommunityId()+"";
        }

        if(StringUtils.isEmpty(merchantId))
        {
            return R.fail("商家id不能为空");
        }

        return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
    }

}