记得上下班打卡 | 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
bb47f2cb
Commit
bb47f2cb
authored
Nov 16, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加 status_sell
parent
4b23ea04
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
3 deletions
+18
-3
PerformanceStep1Param.java
...uidnet/service/kylin/dto/param/PerformanceStep1Param.java
+0
-1
KylinPerformanceVo.java
...uidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
+7
-1
PerformanceVoUtils.java
...client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
+6
-0
PerformanceUtils.java
...com/liquidnet/service/merchant/util/PerformanceUtils.java
+5
-1
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep1Param.java
View file @
bb47f2cb
...
@@ -71,7 +71,6 @@ public class PerformanceStep1Param implements Serializable {
...
@@ -71,7 +71,6 @@ public class PerformanceStep1Param implements Serializable {
private
String
details
;
private
String
details
;
@ApiModelProperty
(
value
=
"演出批文地址"
,
example
=
"这是一个演出批文地址"
)
@ApiModelProperty
(
value
=
"演出批文地址"
,
example
=
"这是一个演出批文地址"
)
@NotNull
(
message
=
"演出批文地址不能为空"
)
private
String
approvalUrl
;
private
String
approvalUrl
;
@ApiModelProperty
(
value
=
"待支付时间"
,
example
=
"5"
)
@ApiModelProperty
(
value
=
"待支付时间"
,
example
=
"5"
)
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
View file @
bb47f2cb
...
@@ -12,7 +12,6 @@ import lombok.Data;
...
@@ -12,7 +12,6 @@ import lombok.Data;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.List
;
import
java.util.List
;
@ApiModel
@ApiModel
...
@@ -74,6 +73,8 @@ public class KylinPerformanceVo {
...
@@ -74,6 +73,8 @@ public class KylinPerformanceVo {
private
Integer
isRecommend
;
private
Integer
isRecommend
;
@ApiModelProperty
(
value
=
"状态"
)
@ApiModelProperty
(
value
=
"状态"
)
private
Integer
appStatus
;
private
Integer
appStatus
;
@ApiModelProperty
(
value
=
"状态 [1正常|2非正常]"
)
private
Integer
status_sell
;
@ApiModelProperty
(
value
=
"是否可买"
)
@ApiModelProperty
(
value
=
"是否可买"
)
private
Integer
statusSell
;
private
Integer
statusSell
;
@ApiModelProperty
(
value
=
"是否关联会员"
)
@ApiModelProperty
(
value
=
"是否关联会员"
)
...
@@ -139,6 +140,11 @@ public class KylinPerformanceVo {
...
@@ -139,6 +140,11 @@ public class KylinPerformanceVo {
this
.
notice
=
performance
.
getNotice
();
this
.
notice
=
performance
.
getNotice
();
this
.
approvalUrl
=
performance
.
getApprovalUrl
();
this
.
approvalUrl
=
performance
.
getApprovalUrl
();
this
.
rejectTxt
=
performance
.
getRejectTxt
();
this
.
rejectTxt
=
performance
.
getRejectTxt
();
if
(
performance
.
getApprovalUrl
()
==
null
||
performance
.
getApprovalUrl
().
isEmpty
())
{
this
.
status_sell
=
0
;
}
else
{
this
.
status_sell
=
1
;
}
}
}
public
void
setTimePriceVipAndLack
(
int
isLackRegister
,
int
isMember
,
int
isExclusive
,
BigDecimal
price
,
LocalDateTime
stopSellTime
,
LocalDateTime
sellMemberTime
,
LocalDateTime
sellTime
,
int
isAdvance
,
int
isDiscount
,
int
payCountdownMinute
)
{
public
void
setTimePriceVipAndLack
(
int
isLackRegister
,
int
isMember
,
int
isExclusive
,
BigDecimal
price
,
LocalDateTime
stopSellTime
,
LocalDateTime
sellMemberTime
,
LocalDateTime
sellTime
,
int
isAdvance
,
int
isDiscount
,
int
payCountdownMinute
)
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @
bb47f2cb
...
@@ -275,6 +275,12 @@ public class PerformanceVoUtils {
...
@@ -275,6 +275,12 @@ public class PerformanceVoUtils {
performanceRelations
.
setUpdatedAt
(
updatedAt
);
performanceRelations
.
setUpdatedAt
(
updatedAt
);
performanceRelations
.
setMerchantId
(
null
);
performanceRelations
.
setMerchantId
(
null
);
if
(
performances
.
getApprovalUrl
()==
null
||
performances
.
getApprovalUrl
().
equals
(
""
)){
performanceStatus
.
setStatusSell
(
0
);
}
else
{
performanceStatus
.
setStatusSell
(
1
);
}
performancesMapper
.
update
(
performances
,
new
UpdateWrapper
<
KylinPerformances
>().
eq
(
"performances_id"
,
performances
.
getPerformancesId
()));
performancesMapper
.
update
(
performances
,
new
UpdateWrapper
<
KylinPerformances
>().
eq
(
"performances_id"
,
performances
.
getPerformancesId
()));
performanceStatusMapper
.
update
(
performanceStatus
,
new
UpdateWrapper
<
KylinPerformanceStatus
>().
eq
(
"performance_id"
,
performances
.
getPerformancesId
()));
performanceStatusMapper
.
update
(
performanceStatus
,
new
UpdateWrapper
<
KylinPerformanceStatus
>().
eq
(
"performance_id"
,
performances
.
getPerformancesId
()));
performanceRelationsMapper
.
update
(
performanceRelations
,
new
UpdateWrapper
<
KylinPerformanceRelations
>().
eq
(
"performance_id"
,
performances
.
getPerformancesId
()));
performanceRelationsMapper
.
update
(
performanceRelations
,
new
UpdateWrapper
<
KylinPerformanceRelations
>().
eq
(
"performance_id"
,
performances
.
getPerformancesId
()));
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java
View file @
bb47f2cb
...
@@ -274,8 +274,12 @@ public class PerformanceUtils {
...
@@ -274,8 +274,12 @@ public class PerformanceUtils {
performanceStatus
.
setCreatedAt
(
performances
.
getCreatedAt
());
performanceStatus
.
setCreatedAt
(
performances
.
getCreatedAt
());
performanceStatus
.
setAuditStatus
(
0
);
performanceStatus
.
setAuditStatus
(
0
);
performanceStatus
.
setUpdatedAt
(
updatedAt
);
performanceStatus
.
setUpdatedAt
(
updatedAt
);
performanceStatus
.
setLimitCountMember
(
1
);
performanceStatus
.
setLimitCountMember
(
1
);
if
(
performances
.
getApprovalUrl
()==
null
||
performances
.
getApprovalUrl
().
equals
(
""
)){
performanceStatus
.
setStatusSell
(
0
);
}
else
{
performanceStatus
.
setStatusSell
(
1
);
}
performanceRelations
.
setPerformanceId
(
performances
.
getPerformancesId
());
performanceRelations
.
setPerformanceId
(
performances
.
getPerformancesId
());
performanceRelations
.
setPerformanceRelationsId
(
IDGenerator
.
nextSnowId
());
performanceRelations
.
setPerformanceRelationsId
(
IDGenerator
.
nextSnowId
());
...
...
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