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
ac4ea205
Commit
ac4ea205
authored
May 26, 2020
by
胡超
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/feature_20200514_1.9.23_discountActiTips'
parents
a6c99dc2
e55fb237
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
+6
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
View file @
ac4ea205
...
@@ -11,6 +11,7 @@ import cn.freemud.service.IPromotionService;
...
@@ -11,6 +11,7 @@ import cn.freemud.service.IPromotionService;
import
cn.freemud.utils.WebUtil
;
import
cn.freemud.utils.WebUtil
;
import
com.freemud.application.sdk.api.promotioncenter.request.promotion.UnifyActivityRequest
;
import
com.freemud.application.sdk.api.promotioncenter.request.promotion.UnifyActivityRequest
;
import
com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService
;
import
com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
...
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/
*/
@Service
@Service
@Slf4j
public
class
FullPromotionService
implements
IPromotionService
{
public
class
FullPromotionService
implements
IPromotionService
{
@Autowired
@Autowired
...
@@ -154,7 +156,10 @@ public class FullPromotionService implements IPromotionService {
...
@@ -154,7 +156,10 @@ public class FullPromotionService implements IPromotionService {
.
append
(
"</span> 减 <span style=\"color:#fa5555\">"
)
.
append
(
"</span> 减 <span style=\"color:#fa5555\">"
)
.
append
(
WebUtil
.
formatAmount
(
benefitBeanDto
.
getDiscountAmount
()
*
1.00
/
100
))
.
append
(
WebUtil
.
formatAmount
(
benefitBeanDto
.
getDiscountAmount
()
*
1.00
/
100
))
.
append
(
"</span> 元"
);
.
append
(
"</span> 元"
);
if
(
i
>
0
)
messageBuilder
.
append
(
","
);
if
(
i
>
0
)
{
messageBuilder
.
append
(
"\\,"
);
log
.
info
(
"debug4tips:i={},tips={}"
,
i
,
messageBuilder
.
toString
());
}
}
}
}
}
}
}
...
...
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