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
3d2f4eda
Commit
3d2f4eda
authored
Feb 26, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
券当日核销不限时
parent
05d390ba
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletions
+7
-1
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ActivityCouponBean.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
+3
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ActivityCouponBean.java
View file @
3d2f4eda
...
@@ -62,6 +62,10 @@ public class ActivityCouponBean {
...
@@ -62,6 +62,10 @@ public class ActivityCouponBean {
* 今日剩余可使用次数(频次券才包含)
* 今日剩余可使用次数(频次券才包含)
*/
*/
private
Integer
dailyAvailableTimes
;
private
Integer
dailyAvailableTimes
;
/**
* 总可使用次数(频次券才包含)
*/
private
Integer
availableTimes
;
/**
/**
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
View file @
3d2f4eda
...
@@ -561,7 +561,9 @@ public class CouponServiceImpl implements CouponService {
...
@@ -561,7 +561,9 @@ public class CouponServiceImpl implements CouponService {
activityCouponBean
.
setActivityCode
(
memberCoupon
.
getActivityCode
());
activityCouponBean
.
setActivityCode
(
memberCoupon
.
getActivityCode
());
activityCouponBean
.
setCouponType
(
couponStateVo
.
getType
());
activityCouponBean
.
setCouponType
(
couponStateVo
.
getType
());
activityCouponBean
.
setDateDescribe
(
couponAdapter
.
getDateDescribe
(
memberCoupon
.
getStatus
(),
memberCoupon
.
getStartTime
(),
memberCoupon
.
getEndTime
()));
activityCouponBean
.
setDateDescribe
(
couponAdapter
.
getDateDescribe
(
memberCoupon
.
getStatus
(),
memberCoupon
.
getStartTime
(),
memberCoupon
.
getEndTime
()));
activityCouponBean
.
setDailyAvailableTimes
(
couponStateVo
.
getDailyAvailableTimes
());
if
(
couponStateVo
.
getDailyAvailableTimes
()
==
null
&&
couponStateVo
.
getAvailableTimes
()
!=
null
){
activityCouponBean
.
setDailyAvailableTimes
(
couponStateVo
.
getAvailableTimes
());
}
// 券状态 0 可用 1 不可用 2 限制可用
// 券状态 0 可用 1 不可用 2 限制可用
if
(
Objects
.
equals
(
activityCouponBean
.
getCouponCode
(),
couponCode
))
{
if
(
Objects
.
equals
(
activityCouponBean
.
getCouponCode
(),
couponCode
))
{
activityCouponBean
.
setSelected
(
YesOrNoEnum
.
YES
.
getCode
());
activityCouponBean
.
setSelected
(
YesOrNoEnum
.
YES
.
getCode
());
...
...
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