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
09214902
Commit
09214902
authored
Jul 02, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加单价接口
parent
22a69e1d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
1 deletion
+31
-1
UnitPriceDTO.java
...java/com/xxfc/platform/order/pojo/order/UnitPriceDTO.java
+12
-0
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+18
-0
ThirdFeign.java
...in/java/com/xxfc/platform/universal/feign/ThirdFeign.java
+1
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/UnitPriceDTO.java
0 → 100644
View file @
09214902
package
com
.
xxfc
.
platform
.
order
.
pojo
.
order
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@Data
public
class
UnitPriceDTO
{
@ApiModelProperty
(
value
=
"旅游保险单价"
)
private
BigDecimal
insurePrice
;
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
09214902
...
@@ -24,8 +24,11 @@ import com.xxfc.platform.order.entity.BaseOrder;
...
@@ -24,8 +24,11 @@ import com.xxfc.platform.order.entity.BaseOrder;
import
com.xxfc.platform.order.mqhandler.RabbitProduct
;
import
com.xxfc.platform.order.mqhandler.RabbitProduct
;
import
com.xxfc.platform.order.pojo.order.CancelOrderDTO
;
import
com.xxfc.platform.order.pojo.order.CancelOrderDTO
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
com.xxfc.platform.order.pojo.order.UnitPriceDTO
;
import
com.xxfc.platform.order.pojo.pay.RentVehicleOrderPayVO
;
import
com.xxfc.platform.order.pojo.pay.RentVehicleOrderPayVO
;
import
com.xxfc.platform.universal.constant.DictionaryKey
;
import
com.xxfc.platform.universal.constant.enumerate.PayChannelEnum
;
import
com.xxfc.platform.universal.constant.enumerate.PayChannelEnum
;
import
com.xxfc.platform.universal.entity.Dictionary
;
import
com.xxfc.platform.universal.feign.ThirdFeign
;
import
com.xxfc.platform.universal.feign.ThirdFeign
;
import
com.xxfc.platform.universal.vo.OrderPayVo
;
import
com.xxfc.platform.universal.vo.OrderPayVo
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
...
@@ -47,8 +50,11 @@ import java.math.BigDecimal;
...
@@ -47,8 +50,11 @@ import java.math.BigDecimal;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
com
.
xxfc
.
platform
.
universal
.
constant
.
DictionaryKey
.
APP_ORDER
;
@Controller
@Controller
@RequestMapping
(
"baseOrder"
)
@RequestMapping
(
"baseOrder"
)
@Api
(
value
=
"订单"
,
tags
=
{
"订单"
})
@Api
(
value
=
"订单"
,
tags
=
{
"订单"
})
...
@@ -83,6 +89,18 @@ public class BaseOrderController extends CommonBaseController {
...
@@ -83,6 +89,18 @@ public class BaseOrderController extends CommonBaseController {
String
qrcodePrefix
=
"fcwx://order"
;
String
qrcodePrefix
=
"fcwx://order"
;
String
notifyUrl
=
"/baseOrder/app/unauth/notifyUrl"
;
String
notifyUrl
=
"/baseOrder/app/unauth/notifyUrl"
;
@RequestMapping
(
value
=
"/app/unauth/getOrderUnitPrice"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
@ApiOperation
(
value
=
"获取订单相关的单价"
)
@IgnoreClientToken
@IgnoreUserToken
public
ObjectRestResponse
<
UnitPriceDTO
>
getOrderUnitPrice
()
{
Map
<
String
,
Dictionary
>
dictionaryMap
=
thirdFeign
.
dictionaryGetAll4Map
().
getData
();
return
ObjectRestResponse
.
succ
(
new
UnitPriceDTO
(){{
setInsurePrice
(
new
BigDecimal
(
dictionaryMap
.
get
(
APP_ORDER
+
"_"
+
DictionaryKey
.
INSURE_PRICE
).
getDetail
()));
}});
}
@RequestMapping
(
value
=
"/page"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/page"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
@ResponseBody
@ApiOperation
(
value
=
"订单列表"
)
@ApiOperation
(
value
=
"订单列表"
)
...
...
xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java
View file @
09214902
...
@@ -73,6 +73,6 @@ public interface ThirdFeign {
...
@@ -73,6 +73,6 @@ public interface ThirdFeign {
/***************************************** 违章 ********************************************/
/***************************************** 违章 ********************************************/
@GetMapping
(
"/getRentViolation"
)
@GetMapping
(
"/
3p/tv/
getRentViolation"
)
public
ObjectRestResponse
<
List
<
ViolationVO
>>
getRentViolation
(
@RequestParam
(
value
=
"rentViolationDTO"
)
Map
<
String
,
Object
>
rentViolationDTO
);
public
ObjectRestResponse
<
List
<
ViolationVO
>>
getRentViolation
(
@RequestParam
(
value
=
"rentViolationDTO"
)
Map
<
String
,
Object
>
rentViolationDTO
);
}
}
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