记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
7fe0eeb8
Commit
7fe0eeb8
authored
Nov 29, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~bindType:新增领取方式'会员专属';
parent
308986b2
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
8 deletions
+10
-8
CandyMemberCouponBuildParam.java
.../service/candy/dto/admin/CandyMemberCouponBuildParam.java
+1
-1
CandyMgtCouponAdminController.java
...troller/zhengzai/candy/CandyMgtCouponAdminController.java
+2
-1
CandyMgtCouponAdminServiceImpl.java
...ai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
+1
-1
CandyCouponListParam.java
...quidnet/service/candy/dto/admin/CandyCouponListParam.java
+1
-1
CandyMgtCouponListParam.java
...dnet/service/candy/dto/admin/CandyMgtCouponListParam.java
+1
-1
CandyCoupon.java
.../java/com/liquidnet/service/candy/entity/CandyCoupon.java
+1
-1
db_ln_candy_initialdata.sql
...idnet-service-candy-impl/docu/db_ln_candy_initialdata.sql
+1
-1
PlatformCandyCouponService.java
...atform/service/impl/candy/PlatformCandyCouponService.java
+2
-1
No files found.
liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMemberCouponBuildParam.java
View file @
7fe0eeb8
...
@@ -41,7 +41,7 @@ public class CandyMemberCouponBuildParam {
...
@@ -41,7 +41,7 @@ public class CandyMemberCouponBuildParam {
@ApiModelProperty
(
required
=
true
,
value
=
"券类型[1-代金券|2-满减券|101-优先券]"
,
allowableValues
=
"1,2,101"
)
@ApiModelProperty
(
required
=
true
,
value
=
"券类型[1-代金券|2-满减券|101-优先券]"
,
allowableValues
=
"1,2,101"
)
private
Integer
couType
;
private
Integer
couType
;
// @NotNull(message = "券领取方式不能为空")
// @NotNull(message = "券领取方式不能为空")
// @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
]", allowableValues = "0,1,2,3
")
// @ApiModelProperty(required = true, value = "领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属]", allowableValues = "0,1,2,3,4
")
// private Integer bindType;
// private Integer bindType;
// @ApiModelProperty(required = false, value = "折扣[8折即0.8]", example = "0.8")
// @ApiModelProperty(required = false, value = "折扣[8折即0.8]", example = "0.8")
// private BigDecimal discount;
// private BigDecimal discount;
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java
View file @
7fe0eeb8
...
@@ -279,7 +279,7 @@ public class CandyMgtCouponAdminController extends BaseController {
...
@@ -279,7 +279,7 @@ public class CandyMgtCouponAdminController extends BaseController {
// }
// }
// }
// }
switch
(
buildParam
.
getBindType
())
{
// 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取]
switch
(
buildParam
.
getBindType
())
{
// 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属
]
case
0
:
case
0
:
buildParam
.
setEventType
(
0
);
buildParam
.
setEventType
(
0
);
buildParam
.
setEventLimit
(
null
);
buildParam
.
setEventLimit
(
null
);
...
@@ -288,6 +288,7 @@ public class CandyMgtCouponAdminController extends BaseController {
...
@@ -288,6 +288,7 @@ public class CandyMgtCouponAdminController extends BaseController {
}
}
break
;
break
;
case
3
:
// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户)
case
3
:
// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户)
case
4
:
// 新增券领取类型(4-会员专属)处理逻辑同(1-发放至用户)
case
1
:
case
1
:
if
(
buildParam
.
getEventType
()
==
2
)
{
// 指定用户手机号
if
(
buildParam
.
getEventType
()
==
2
)
{
// 指定用户手机号
if
(
StringUtils
.
isBlank
(
buildParam
.
getEventLimit
()))
{
if
(
StringUtils
.
isBlank
(
buildParam
.
getEventLimit
()))
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
View file @
7fe0eeb8
...
@@ -73,7 +73,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
...
@@ -73,7 +73,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
// initCoupon.setExclusive(1);
// initCoupon.setExclusive(1);
// initCoupon.setBusiType(parameter.getBusiType());
// initCoupon.setBusiType(parameter.getBusiType());
// initCoupon.setCouType(parameter.getCouType());
// initCoupon.setCouType(parameter.getCouType());
// initCoupon.setBindType(1);// 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取]
// initCoupon.setBindType(1);// 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属
]
// //initCoupon.setDiscount();
// //initCoupon.setDiscount();
// initCoupon.setValFace(parameter.getValFace());
// initCoupon.setValFace(parameter.getValFace());
// initCoupon.setValOver(parameter.getValOver());
// initCoupon.setValOver(parameter.getValOver());
...
...
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyCouponListParam.java
View file @
7fe0eeb8
...
@@ -10,7 +10,7 @@ public class CandyCouponListParam {
...
@@ -10,7 +10,7 @@ public class CandyCouponListParam {
*/
*/
private
String
keyword
;
private
String
keyword
;
/**
/**
* 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取]
* 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属
]
*/
*/
private
Integer
bindType
;
private
Integer
bindType
;
/**
/**
...
...
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponListParam.java
View file @
7fe0eeb8
...
@@ -12,7 +12,7 @@ public class CandyMgtCouponListParam {
...
@@ -12,7 +12,7 @@ public class CandyMgtCouponListParam {
*/
*/
private
String
keyword
;
private
String
keyword
;
/**
/**
* 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取]
* 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属
]
*/
*/
private
Integer
bindType
;
private
Integer
bindType
;
/**
/**
...
...
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCoupon.java
View file @
7fe0eeb8
...
@@ -65,7 +65,7 @@ public class CandyCoupon implements Serializable {
...
@@ -65,7 +65,7 @@ public class CandyCoupon implements Serializable {
private
Integer
couType
;
private
Integer
couType
;
/**
/**
* 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取]
* 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属
]
*/
*/
private
Integer
bindType
;
private
Integer
bindType
;
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql
View file @
7fe0eeb8
...
@@ -39,7 +39,7 @@ create table candy_coupon
...
@@ -39,7 +39,7 @@ create table candy_coupon
exclusive
smallint
comment
'专享标识[0-常规|1-会员礼包]'
,
exclusive
smallint
comment
'专享标识[0-常规|1-会员礼包]'
,
busi_type
smallint
comment
'业务类别[0-全场|1-演出|2-商品|3-优先购]'
,
busi_type
smallint
comment
'业务类别[0-全场|1-演出|2-商品|3-优先购]'
,
cou_type
smallint
comment
'券类型[1-代金券|2-满减券|3-兑换券|4-折扣券|101-优先券]'
,
cou_type
smallint
comment
'券类型[1-代金券|2-满减券|3-兑换券|4-折扣券|101-优先券]'
,
bind_type
smallint
comment
'领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取]'
,
bind_type
smallint
comment
'领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属
]'
,
discount
decimal
(
8
,
2
)
comment
'折扣[8折即0.8]'
,
discount
decimal
(
8
,
2
)
comment
'折扣[8折即0.8]'
,
val_face
decimal
(
8
,
2
)
comment
'面值'
,
val_face
decimal
(
8
,
2
)
comment
'面值'
,
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java
View file @
7fe0eeb8
...
@@ -55,7 +55,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
...
@@ -55,7 +55,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
String
couponInfoDtoKey
=
CandyRedisConst
.
BASIC_COUPON_INFO
.
concat
(
couponInfoDto
.
getCouponId
());
String
couponInfoDtoKey
=
CandyRedisConst
.
BASIC_COUPON_INFO
.
concat
(
couponInfoDto
.
getCouponId
());
redisDataSourceUtil
.
getRedisCandyUtil
().
set
(
couponInfoDtoKey
,
couponInfoDto
);
redisDataSourceUtil
.
getRedisCandyUtil
().
set
(
couponInfoDtoKey
,
couponInfoDto
);
switch
(
coupon
.
getBindType
())
{
// 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取]
switch
(
coupon
.
getBindType
())
{
// 领取方式[0-用户输入兑换|1-发放至用户|2-积分兑换|3-发放需领取
|4-会员专属
]
case
0
:
case
0
:
this
.
processingCouponCode
(
mgtCoupon
,
coupon
);
this
.
processingCouponCode
(
mgtCoupon
,
coupon
);
break
;
break
;
...
@@ -76,6 +76,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
...
@@ -76,6 +76,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
// }
// }
// break;
// break;
case
3
:
// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户|2-积分兑换)
case
3
:
// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户|2-积分兑换)
case
4
:
// 新增券领取类型(4-会员专属)处理逻辑同(1-发放至用户|2-积分兑换)
case
2
:
// TODO: 2021/11/9 PM上线前临时加的券领取类型(2-积分兑换),这里`1-发放至用户|2-积分兑换`做同逻辑处理
case
2
:
// TODO: 2021/11/9 PM上线前临时加的券领取类型(2-积分兑换),这里`1-发放至用户|2-积分兑换`做同逻辑处理
switch
(
mgtCoupon
.
getEventType
())
{
// 发放类型[1-会员|2-手机号|10-全体用户]
switch
(
mgtCoupon
.
getEventType
())
{
// 发放类型[1-会员|2-手机号|10-全体用户]
case
1
:
case
1
:
...
...
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