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
jenkins
order-group
Commits
384a9fc8
Commit
384a9fc8
authored
Dec 23, 2019
by
haibo.jiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付有礼活动增加skuid
parent
1c7d05c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGitCheckAndJoinRequestDto.java
+4
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-0
No files found.
order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGitCheckAndJoinRequestDto.java
View file @
384a9fc8
...
...
@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.util.List
;
@Data
public
class
PayGitCheckAndJoinRequestDto
{
//门店编号
...
...
@@ -22,4 +24,6 @@ public class PayGitCheckAndJoinRequestDto {
//点餐方式 1-到店取餐 2-外卖
private
Integer
orderWay
;
private
List
<
String
>
skuIds
;
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
384a9fc8
...
...
@@ -803,6 +803,9 @@ public class OrderServiceImpl implements Orderservice {
payGitRequestDto
.
setOid
(
queryOrderResponseVo
.
getOid
());
payGitRequestDto
.
setPayAmount
(
queryOrderResponseVo
.
getAmount
());
payGitRequestDto
.
setPayType
(
1
);
//1-微信,2-储值卡
if
(
CollectionUtils
.
isNotEmpty
(
queryOrderResponseVo
.
getProducts
())){
payGitRequestDto
.
setSkuIds
(
queryOrderResponseVo
.
getProducts
().
stream
().
map
(
p
->
p
.
getPid
()).
collect
(
Collectors
.
toList
()));
}
if
(
OrderType
.
COLLECT_GOODS
.
getCode
().
intValue
()
==
queryOrderResponseVo
.
getOrderType
()
||
OrderType
.
EAT_IN
.
getCode
().
intValue
()
==
queryOrderResponseVo
.
getOrderType
())
{
payGitRequestDto
.
setOrderWay
(
1
);
}
else
{
...
...
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