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
1dac6e43
Commit
1dac6e43
authored
Jun 14, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
92bab3a6
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
2 deletions
+41
-2
BaseController.java
...m/github/wxiaoqi/security/common/rest/BaseController.java
+8
-0
OrderTourDetail.java
.../java/com/xxfc/platform/order/entity/OrderTourDetail.java
+0
-2
TourBO.java
.../main/java/com/xxfc/platform/order/pojo/order/TourBO.java
+1
-0
OrderTourService.java
...ava/com/xxfc/platform/order/service/OrderTourService.java
+8
-0
TourFeign.java
...src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
+5
-0
TourGoodVerificationController.java
...fc/platform/tour/rest/TourGoodVerificationController.java
+19
-0
No files found.
ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java
View file @
1dac6e43
...
...
@@ -78,4 +78,12 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
Query
query
=
new
Query
(
params
);
return
baseBiz
.
selectByQuery
(
query
);
}
@ApiOperation
(
"根据参数查询,等于"
)
@RequestMapping
(
value
=
"/entityList"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
public
ObjectRestResponse
<
List
<
Entity
>>
entityList
(
Entity
entity
){
//查询列表数据
return
ObjectRestResponse
.
succ
(
baseBiz
.
selectList
(
entity
));
}
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderTourDetail.java
View file @
1dac6e43
...
...
@@ -144,6 +144,4 @@ public class OrderTourDetail implements Serializable {
@ApiModelProperty
(
value
=
"出发城市名称"
)
private
String
startCityName
;
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/TourBO.java
View file @
1dac6e43
...
...
@@ -19,4 +19,5 @@ public class TourBO extends OrderTourDetail implements OrderDetail {
TourGood
tourGood
;
List
<
TourUser
>
tourUsers
;
AppUserDTO
appUserDTO
;
private
Integer
siteId
;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java
View file @
1dac6e43
...
...
@@ -26,6 +26,7 @@ import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
import
com.xxfc.platform.order.pojo.price.TourPriceVO
;
import
com.xxfc.platform.tour.dto.TourSpePriceDTO
;
import
com.xxfc.platform.tour.entity.TourGood
;
import
com.xxfc.platform.tour.entity.TourGoodVerification
;
import
com.xxfc.platform.tour.entity.TourUser
;
import
com.xxfc.platform.tour.feign.TourFeign
;
import
com.xxfc.platform.tour.vo.TourSpePriceVo
;
...
...
@@ -111,6 +112,13 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
bo
.
setStartCity
(
sysRegion
.
getId
().
intValue
());
bo
.
setStartCityName
(
sysRegion
.
getName
());
//设置verificationId 核销id
bo
.
setVerificationId
(
tourFeign
.
entityList
(
BeanUtil
.
beanToMap
(
new
TourGoodVerification
(){{
setSpeId
(
bo
.
getSpePriceId
());
setGoodId
(
bo
.
getGoodId
());
setSiteId
(
bo
.
getSiteId
());
}})).
getData
().
get
(
0
).
getId
());
//扣減庫存
tourFeign
.
stock
(
bo
.
getSpePriceId
(),
bo
.
getTotalNumber
());
...
...
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
View file @
1dac6e43
...
...
@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.common.msg.ListRestResponse;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.tour.dto.TourSpePriceDTO
;
import
com.xxfc.platform.tour.entity.TourGood
;
import
com.xxfc.platform.tour.entity.TourGoodVerification
;
import
com.xxfc.platform.tour.entity.TourUser
;
import
com.xxfc.platform.tour.vo.TourSpePriceVo
;
import
io.swagger.annotations.ApiParam
;
...
...
@@ -12,6 +13,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -41,4 +43,7 @@ public interface TourFeign {
@GetMapping
(
"/tourUser/app/unauth/getTourUsers"
)
public
ObjectRestResponse
<
List
<
TourUser
>>
getTourUsers
(
@RequestParam
String
ids
);
@GetMapping
(
"/tourGoodVerification/entityList"
)
public
ObjectRestResponse
<
List
<
TourGoodVerification
>>
entityList
(
@RequestParam
Map
<
String
,
Object
>
entity
);
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java
0 → 100644
View file @
1dac6e43
package
com
.
xxfc
.
platform
.
tour
.
rest
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.common.rest.BaseController
;
import
com.xxfc.platform.tour.biz.TourGoodTagBiz
;
import
com.xxfc.platform.tour.biz.TourGoodVerificationBiz
;
import
com.xxfc.platform.tour.entity.TourGoodTag
;
import
com.xxfc.platform.tour.entity.TourGoodVerification
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
@RestController
@RequestMapping
(
"tourGoodVerification"
)
@IgnoreUserToken
@IgnoreClientToken
public
class
TourGoodVerificationController
extends
BaseController
<
TourGoodVerificationBiz
,
TourGoodVerification
>
{
}
\ No newline at end of file
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