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
c292c703
Commit
c292c703
authored
Jun 24, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
18f6739b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
OrderTourVerificationBiz.java
...com/xxfc/platform/order/biz/OrderTourVerificationBiz.java
+2
-1
TourFeign.java
...src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
+3
-1
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 @
c292c703
package
com
.
xxfc
.
platform
.
order
.
biz
;
package
com
.
xxfc
.
platform
.
order
.
biz
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
...
@@ -66,7 +67,7 @@ public class OrderTourVerificationBiz{
...
@@ -66,7 +67,7 @@ public class OrderTourVerificationBiz{
//核销列表
//核销列表
public
ObjectRestResponse
getVerifications
(
TourGoodOrderFindVo
tourGoodOrderFindVo
){
public
ObjectRestResponse
getVerifications
(
TourGoodOrderFindVo
tourGoodOrderFindVo
){
return
ObjectRestResponse
.
succ
(
tourFeign
.
findTourGoodOrders
(
tourGoodOrderFindVo
));
return
ObjectRestResponse
.
succ
(
tourFeign
.
findTourGoodOrders
(
BeanUtil
.
beanToMap
(
tourGoodOrderFindVo
)
));
}
}
...
...
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
View file @
c292c703
...
@@ -12,6 +12,8 @@ import com.xxfc.platform.tour.vo.TourGoodOrderVo;
...
@@ -12,6 +12,8 @@ import com.xxfc.platform.tour.vo.TourGoodOrderVo;
import
com.xxfc.platform.tour.vo.TourSpePriceVo
;
import
com.xxfc.platform.tour.vo.TourSpePriceVo
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -78,5 +80,5 @@ public interface TourFeign {
...
@@ -78,5 +80,5 @@ public interface TourFeign {
* @return
* @return
*/
*/
@GetMapping
(
"/tourGood/verfication/orders"
)
@GetMapping
(
"/tourGood/verfication/orders"
)
ObjectRestResponse
<
PageDataVO
<
TourGoodOrderVo
>>
findTourGoodOrders
(
@RequestBody
TourGoodOrderFindVo
tourGoodOrderFindVo
);
PageDataVO
<
TourGoodOrderVo
>
findTourGoodOrders
(
@RequestParam
Map
<
String
,
Object
>
tourGoodOrderFindVo
);
}
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java
View file @
c292c703
...
@@ -22,9 +22,9 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
...
@@ -22,9 +22,9 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
*/
*/
@ApiOperation
(
"订单列表的查询"
)
@ApiOperation
(
"订单列表的查询"
)
@GetMapping
(
"/orders"
)
@GetMapping
(
"/orders"
)
public
ObjectRestResponse
<
PageDataVO
<
TourGoodOrderVo
>>
findTourGoodOrders
(
@RequestBody
TourGoodOrderFindVo
tourGoodOrderFindVo
){
public
PageDataVO
<
TourGoodOrderVo
>
findTourGoodOrders
(
TourGoodOrderFindVo
tourGoodOrderFindVo
){
PageDataVO
<
TourGoodOrderVo
>
tourGoodOrderPageDataVo
=
getBaseBiz
().
findTourGoodOrdersPage
(
tourGoodOrderFindVo
);
PageDataVO
<
TourGoodOrderVo
>
tourGoodOrderPageDataVo
=
getBaseBiz
().
findTourGoodOrdersPage
(
tourGoodOrderFindVo
);
return
ObjectRestResponse
.
succ
(
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