Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
5f03c0df
Commit
5f03c0df
authored
Oct 28, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
保存随单购券的键位
parent
0402e85c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletions
+8
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2
-1
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
+5
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
5f03c0df
...
@@ -392,6 +392,7 @@ public class OrderSdkAdapter {
...
@@ -392,6 +392,7 @@ public class OrderSdkAdapter {
orderCostCreateReq
.
setProductSeq
(
accountRequest
.
getSequence
());
orderCostCreateReq
.
setProductSeq
(
accountRequest
.
getSequence
());
//1=订单,2=订单商品,3=售后单
//1=订单,2=订单商品,3=售后单
orderCostCreateReq
.
setBillType
(
1
);
orderCostCreateReq
.
setBillType
(
1
);
orderCostCreateReq
.
setProductId
(
accountRequest
.
getProductId
());
orderCostCreateReqs
.
add
(
orderCostCreateReq
);
orderCostCreateReqs
.
add
(
orderCostCreateReq
);
}
else
{
}
else
{
OrderSettlementCreateReq
orderSettlementCreateReq
=
new
OrderSettlementCreateReq
();
OrderSettlementCreateReq
orderSettlementCreateReq
=
new
OrderSettlementCreateReq
();
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
5f03c0df
...
@@ -246,13 +246,14 @@ public class OrderAdapter {
...
@@ -246,13 +246,14 @@ public class OrderAdapter {
.
build
();
.
build
();
orderAccountDtos
.
add
(
createOrderAccountDto
);
orderAccountDtos
.
add
(
createOrderAccountDto
);
}
}
if
(
null
!=
shoppingCartGoodsDto
.
getPayCardFee
()
&&
0
l
!=
shoppingCartGoodsDto
.
getPayCardFee
())
{
if
(
null
!=
shoppingCartGoodsDto
.
getPayCardFee
()
&&
0
l
!=
shoppingCartGoodsDto
.
getPayCardFee
()
&&
StringUtils
.
isNotBlank
(
createOrderVo
.
getCardKeyCode
())
)
{
CreateOrderAccountRequest
createOrderAccountDto
=
CreateOrderAccountRequest
.
builder
()
CreateOrderAccountRequest
createOrderAccountDto
=
CreateOrderAccountRequest
.
builder
()
.
accountId
(
""
)
.
accountId
(
""
)
.
name
(
"啡常月享卡"
)
.
name
(
"啡常月享卡"
)
.
price
(
shoppingCartGoodsDto
.
getPayCardFee
())
.
price
(
shoppingCartGoodsDto
.
getPayCardFee
())
.
accountType
(
QueryOrderAccountType
.
MCCAFE_MONTH_CARD
)
.
accountType
(
QueryOrderAccountType
.
MCCAFE_MONTH_CARD
)
.
sequence
(
orderAccountIndex
++)
.
sequence
(
orderAccountIndex
++)
.
productId
(
createOrderVo
.
getCardKeyCode
())
.
build
();
.
build
();
orderAccountDtos
.
add
(
createOrderAccountDto
);
orderAccountDtos
.
add
(
createOrderAccountDto
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
View file @
5f03c0df
...
@@ -195,6 +195,11 @@ public class CreateOrderVo {
...
@@ -195,6 +195,11 @@ public class CreateOrderVo {
*/
*/
private
String
faceCode
;
private
String
faceCode
;
/**
* 随单购啡常月享卡键位
*/
private
String
cardKeyCode
;
@ApiModelProperty
(
hidden
=
true
)
@ApiModelProperty
(
hidden
=
true
)
private
String
sessionKey
;
// 存储sessionKey,异常补退使用
private
String
sessionKey
;
// 存储sessionKey,异常补退使用
@ApiModelProperty
(
hidden
=
true
)
@ApiModelProperty
(
hidden
=
true
)
...
...
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