记得上下班打卡 | 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
5e48d024
Commit
5e48d024
authored
Feb 04, 2024
by
zz
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/20240123_COUPON_SPU' into 阶梯退票_羊毛券_合并分支
parents
f9e504be
3a18b35a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
GoblinStoreMgtGoodsServiceImpl.java
...n/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
+4
-4
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
View file @
5e48d024
...
@@ -329,16 +329,16 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
...
@@ -329,16 +329,16 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
skuInfoVo
.
getCouType
(),
skuInfoVo
.
getValFace
(),
skuInfoVo
.
getValidity
(),
skuInfoVo
.
getIsTrueName
(),
skuInfoVo
.
getCouType
(),
skuInfoVo
.
getValFace
(),
skuInfoVo
.
getValidity
(),
skuInfoVo
.
getIsTrueName
(),
skuInfoVo
.
getEffectAt
(),
skuInfoVo
.
getExpireAt
(),
createdBy
,
createdAt
skuInfoVo
.
getEffectAt
(),
skuInfoVo
.
getExpireAt
(),
createdBy
,
createdAt
});
});
String
busiName
=
"%s
系列
"
;
String
busiName
=
"%s"
;
switch
(
skuInfoVo
.
getUseScope
())
{
// 适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]
switch
(
skuInfoVo
.
getUseScope
())
{
// 适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]
case
101
:
// 音乐节
case
101
:
// 音乐节
busiName
=
String
.
format
(
busiName
,
"
音乐节"
);
busiName
=
String
.
format
(
busiName
,
"
草莓、M_DSK、五百里音乐节"
);
// 按杨要求文案'音乐节'改'草莓、M_DSK、五百里音乐节'
break
;
break
;
case
102
:
// 小型演出(LiveHouse演出)
case
102
:
// 小型演出(LiveHouse演出)
busiName
=
String
.
format
(
busiName
,
"小型演出(LiveHouse演出)"
);
busiName
=
String
.
format
(
busiName
,
"小型演出(LiveHouse演出)
系列
"
);
break
;
break
;
case
103
:
// 巡演
case
103
:
// 巡演
busiName
=
String
.
format
(
busiName
,
"巡演"
);
busiName
=
String
.
format
(
busiName
,
"巡演
系列
"
);
break
;
break
;
}
}
initCandyCouponRuleObjs
.
add
(
new
Object
[]{
IDGenerator
.
nextTimeId2
(),
skuId
,
skuInfoVo
.
getUseScope
(),
busiName
,
""
});
initCandyCouponRuleObjs
.
add
(
new
Object
[]{
IDGenerator
.
nextTimeId2
(),
skuId
,
skuInfoVo
.
getUseScope
(),
busiName
,
""
});
...
...
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