新增商家线下订

lidongdong

2023-11-23 b3ea93fb8b59b2c7a0b505b6dd6114d933eeaa61

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

@@ -646,8 +646,6 @@

    /**
     * 每日签到记录列表  前15条
     * @param userId
     * @param communityId
     * @return
     */
    @ApiOperation(value = "每日签到记录列表  前15条", response = IntegratingTaskVO.class)
@@ -691,10 +689,12 @@
                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType)
                          @RequestParam(value = "cancelType", required = false)String cancelType,
                          @RequestParam(value = "merchantId", required = false) String merchantId,
                          @RequestParam(value = "orderType", required = false) String orderType)
    {
        return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
                goodName,name,cancelType,getCommunityId()+"");
                goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
    }

    /**
@@ -720,6 +720,7 @@
    {
        item.setCommunityId(getCommunityId()+"");
        item.setUserId(getUserId()+"");
        item.setOrderType("1");
        return newStriveForFeign.orderAddData(item);
    }