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
bb84858d
Commit
bb84858d
authored
Jun 01, 2020
by
梁崇福
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20200528_1.9.25_集点参数为0不要调会员接口' into 'develop'
不等于0时不调会员接口 See merge request
!3
parents
cf355805
076e6bb1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
+3
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+3
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
bb84858d
...
...
@@ -293,7 +293,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if
(
activityTypes
.
contains
(
221
)){
DiscountDTO
discountDTO
=
baseResponse
.
getData
().
getDiscounts
().
stream
().
filter
(
d
->
221
==
d
.
getType
()).
findFirst
().
get
();
SendPointRequest
pointRequest
=
memberSdkAdapter
.
convert2SendPointRequest
(
confirmOrderRequest
,
orderByIdResponse
.
getData
(),
discountDTO
);
memberPropertyService
.
sendMemberPoint
(
pointRequest
,
confirmOrderRequest
.
getTrackingNo
());
if
(
pointRequest
.
getSendPoint
()
!=
0
)
{
memberPropertyService
.
sendMemberPoint
(
pointRequest
,
confirmOrderRequest
.
getTrackingNo
());
}
}
return
orderSdkAdapter
.
convent2PayAccessResponse
(
response
);
...
...
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