Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
992d784b
Commit
992d784b
authored
Jul 01, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
5b283654
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
OrderTourVerificationBiz.java
...com/xxfc/platform/order/biz/OrderTourVerificationBiz.java
+1
-1
TourFeign.java
...src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
+2
-2
TourGoodVerificationController.java
...fc/platform/tour/rest/TourGoodVerificationController.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java
View file @
992d784b
...
@@ -101,7 +101,7 @@ public class OrderTourVerificationBiz{
...
@@ -101,7 +101,7 @@ public class OrderTourVerificationBiz{
//核销列表
//核销列表
public
ObjectRestResponse
getVerifications
(
TourGoodOrderFindVo
tourGoodOrderFindVo
){
public
ObjectRestResponse
getVerifications
(
TourGoodOrderFindVo
tourGoodOrderFindVo
){
return
ObjectRestResponse
.
succ
(
tourFeign
.
findTourGoodOrders
(
BeanUtil
.
beanToMap
(
tourGoodOrderFindVo
)
));
return
ObjectRestResponse
.
succ
(
tourFeign
.
findTourGoodOrders
(
tourGoodOrderFindVo
));
}
}
public
boolean
isPower
(
List
<
BranchCompany
>
list
,
Integer
companyId
){
public
boolean
isPower
(
List
<
BranchCompany
>
list
,
Integer
companyId
){
...
...
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
View file @
992d784b
...
@@ -83,8 +83,8 @@ public interface TourFeign {
...
@@ -83,8 +83,8 @@ public interface TourFeign {
* @param tourGoodOrderFindVo
* @param tourGoodOrderFindVo
* @return
* @return
*/
*/
@
GetMapping
(
"/tourGood/verfication/orders"
)
@
RequestMapping
(
value
=
"/tourGood/verfication/orders"
,
method
=
RequestMethod
.
POST
)
PageDataVO
<
TourGoodOrderVo
>
findTourGoodOrders
(
@Request
Param
(
"tourGoodOrderFindVo"
)
Map
<
String
,
Object
>
tourGoodOrderFindVo
);
PageDataVO
<
TourGoodOrderVo
>
findTourGoodOrders
(
@Request
Body
TourGoodOrderFindVo
tourGoodOrderFindVo
);
@ApiOperation
(
"首页旅游列表"
)
@ApiOperation
(
"首页旅游列表"
)
@GetMapping
(
value
=
"/tourGood/app/shopList"
)
@GetMapping
(
value
=
"/tourGood/app/shopList"
)
...
...
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java
View file @
992d784b
...
@@ -21,8 +21,8 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
...
@@ -21,8 +21,8 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
* @return
* @return
*/
*/
@ApiOperation
(
"订单列表的查询"
)
@ApiOperation
(
"订单列表的查询"
)
@
GetMapping
(
"/orders"
)
@
RequestMapping
(
value
=
"/orders"
,
method
=
RequestMethod
.
POST
)
public
PageDataVO
<
TourGoodOrderVo
>
findTourGoodOrders
(
TourGoodOrderFindVo
tourGoodOrderFindVo
){
public
PageDataVO
<
TourGoodOrderVo
>
findTourGoodOrders
(
@RequestBody
TourGoodOrderFindVo
tourGoodOrderFindVo
){
PageDataVO
<
TourGoodOrderVo
>
tourGoodOrderPageDataVo
=
getBaseBiz
().
findTourGoodOrdersPage
(
tourGoodOrderFindVo
);
PageDataVO
<
TourGoodOrderVo
>
tourGoodOrderPageDataVo
=
getBaseBiz
().
findTourGoodOrdersPage
(
tourGoodOrderFindVo
);
return
tourGoodOrderPageDataVo
;
return
tourGoodOrderPageDataVo
;
}
}
...
...
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