Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
openApi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hj
openApi
Commits
a3a7297c
Commit
a3a7297c
authored
Oct 17, 2022
by
hangjun83
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口bug修复
parent
0fad9fec
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
16 deletions
+19
-16
server/app/Http/Controllers/V1/Rhawn/OrdersController.php
server/app/Http/Controllers/V1/Rhawn/OrdersController.php
+15
-12
server/app/Http/Controllers/V1/Rhawn/ProductsController.php
server/app/Http/Controllers/V1/Rhawn/ProductsController.php
+4
-4
No files found.
server/app/Http/Controllers/V1/Rhawn/OrdersController.php
View file @
a3a7297c
...
...
@@ -39,7 +39,7 @@ class OrdersController extends Controller
* @Post(
* path="/openapi/orders/getRhawnOrders",
* tags={"订单相关接口"},
* summary="
获取用户订单列表数据集
",
* summary="
用户订单列表数据
",
* description="订单列表",
* @RequestBody(
* @MediaType(
...
...
@@ -49,7 +49,9 @@ class OrdersController extends Controller
* @Property(property="pageSize", @Schema(type="integer"),description="返回数据集数量"),
* @Property(property="pageNo", @Schema(type="integer"),description="当前页数"),
* example={"pageSize" : 100, "pageNo" : 1}
* )
* ),
* @OA\Examples(example="pageSize", value="100",summary="每页的数据量"),
* @OA\Examples(example="pageNo", value="1",summary="当前页数"),
* )
* ),
* @OA\Parameter(
...
...
@@ -88,11 +90,10 @@ class OrdersController extends Controller
return
Response
::
ok
(
'客户编号不存在!'
);
}
$params
=
[
'customer_code'
=>
$customerCode
];
$requestParams
=
$this
->
formatKeysfromArray
(
$request
->
all
(),
'toUnderScore'
);
$requestParams
=
array_merge
(
$requestParams
,[
'customer_code'
=>
$customerCode
]);
try
{
$orderList
=
$this
->
rhawnOrdersService
->
getCustomerRhawnOrdersList
(
$
p
arams
);
$orderList
=
$this
->
rhawnOrdersService
->
getCustomerRhawnOrdersList
(
$
requestP
arams
);
if
(
$orderList
){
$orderList
=
$this
->
formatKeysfromArray
(
$orderList
,
'toCamelCase'
);
}
...
...
@@ -106,7 +107,7 @@ class OrdersController extends Controller
* @Post(
* path="/openapi/orders/getRhawnOrderDetail",
* tags={"订单相关接口"},
* summary="
获取用户订单详情数据集
",
* summary="
用户订单详情数据
",
* description="订单详情",
* @RequestBody(
* @MediaType(
...
...
@@ -114,8 +115,9 @@ class OrdersController extends Controller
* @Schema(
* required={"orderNumber"},
* @Property(property="orderNumber", @Schema(type="string"),description="订单编号"),
* example={"orderNumber" : "XXXXXX"}
* )
* example={"orderNumber" : "20221008-122565111"}
* ),
* @OA\Examples(example="orderNumber", value="20221008-122565111",summary="订单编号"),
* )
* ),
* @OA\Parameter(
...
...
@@ -172,7 +174,7 @@ class OrdersController extends Controller
* @Post(
* path="/openapi/orders/createRhawnOrders",
* tags={"订单相关接口"},
* summary="生成
一个
用户新订单",
* summary="生成用户新订单",
* description="生成新订单",
* @RequestBody(
* @MediaType(
...
...
@@ -283,7 +285,7 @@ class OrdersController extends Controller
* @Post(
* path="/openapi/orders/getOrdersDispatch",
* tags={"订单相关接口"},
* summary="
获取
订单的配货单信息",
* summary="订单的配货单信息",
* description="配货单信息",
* @RequestBody(
* @MediaType(
...
...
@@ -292,7 +294,8 @@ class OrdersController extends Controller
* required={"orderNumber"},
* @Property(property="orderNumber", @Schema(type="string"),description="订单编号"),
* example={"orderNumber" : "20221008-122565111"}
* )
* ),
* @OA\Examples(example="orderNumber", value="20221008-122565111",summary="订单编号"),
* )
* ),
* @OA\Parameter(
...
...
server/app/Http/Controllers/V1/Rhawn/ProductsController.php
View file @
a3a7297c
...
...
@@ -79,11 +79,11 @@ class ProductsController extends Controller
return
Response
::
ok
(
'客户编号不存在!'
);
}
$
params
=
[
'customer_code'
=>
$customerCode
];
$
requestParams
=
$this
->
formatKeysfromArray
(
$request
->
all
(),
'toUnderScore'
);
$requestParams
=
array_merge
(
$requestParams
,[
'customer_code'
=>
$customerCode
]);
try
{
$productList
=
$this
->
rhawnProductsService
->
getAllProducts
(
$
p
arams
);
$productList
=
$this
->
rhawnProductsService
->
getAllProducts
(
$
requestP
arams
);
if
(
$productList
){
$productList
=
$this
->
formatKeysfromArray
(
$productList
,
'toCamelCase'
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment