记得上下班打卡 | 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
017f2036
Commit
017f2036
authored
Jan 21, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加 接口
parent
8d61cd38
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
13 deletions
+26
-13
GoblinStoreZhengzaiParam.java
...t/service/goblin/dto/manage/GoblinStoreZhengzaiParam.java
+3
-0
GoblinSelfMarketingVo.java
...iquidnet/service/goblin/dto/vo/GoblinSelfMarketingVo.java
+2
-0
GoblinSelfZhengzaiController.java
...troller/zhengzai/goblin/GoblinSelfZhengzaiController.java
+2
-2
IGoblinZhengzaiMarketService.java
...zhengzai/goblin/service/IGoblinZhengzaiMarketService.java
+2
-2
GoblinZhengzaiMarketServiceImpl.java
.../goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java
+11
-7
PerformanceTitleDao.java
.../com/liquidnet/service/kylin/dao/PerformanceTitleDao.java
+1
-0
KylinPerformancesMapper.xml
...iquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
+5
-2
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreZhengzaiParam.java
View file @
017f2036
...
@@ -15,6 +15,9 @@ public class GoblinStoreZhengzaiParam {
...
@@ -15,6 +15,9 @@ public class GoblinStoreZhengzaiParam {
@ApiModelProperty
(
required
=
true
,
value
=
"演出id"
,
example
=
"1"
)
@ApiModelProperty
(
required
=
true
,
value
=
"演出id"
,
example
=
"1"
)
private
String
performanceId
;
private
String
performanceId
;
@ApiModelProperty
(
required
=
true
,
value
=
"演出图"
,
example
=
"1"
)
private
String
performanceImg
;
@ApiModelProperty
(
required
=
true
,
value
=
"商铺id"
,
example
=
"活动名称"
)
@ApiModelProperty
(
required
=
true
,
value
=
"商铺id"
,
example
=
"活动名称"
)
private
String
storeId
;
private
String
storeId
;
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinSelfMarketingVo.java
View file @
017f2036
...
@@ -26,6 +26,8 @@ public class GoblinSelfMarketingVo implements Serializable, Cloneable {
...
@@ -26,6 +26,8 @@ public class GoblinSelfMarketingVo implements Serializable, Cloneable {
private
String
selfMarketId
;
private
String
selfMarketId
;
@ApiModelProperty
(
value
=
"演出id"
)
@ApiModelProperty
(
value
=
"演出id"
)
private
String
performanceId
;
private
String
performanceId
;
@ApiModelProperty
(
value
=
"演出图"
)
private
String
performanceImg
;
@ApiModelProperty
(
value
=
"营销名称"
)
@ApiModelProperty
(
value
=
"营销名称"
)
private
String
name
;
private
String
name
;
@ApiModelProperty
(
value
=
"营销类型[1-正在下单]"
)
@ApiModelProperty
(
value
=
"营销类型[1-正在下单]"
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfZhengzaiController.java
View file @
017f2036
...
@@ -83,7 +83,7 @@ public class GoblinSelfZhengzaiController extends BaseController {
...
@@ -83,7 +83,7 @@ public class GoblinSelfZhengzaiController extends BaseController {
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ResponseBody
@ResponseBody
public
ResponseDto
<
String
>
purchasingInsert
(
GoblinStoreZhengzaiParam
goblinStoreZhengzaiParam
)
{
public
ResponseDto
<
String
>
purchasingInsert
(
GoblinStoreZhengzaiParam
goblinStoreZhengzaiParam
)
{
return
goblinZhengzaiMarketService
.
zhengzaiInsert
(
goblinStoreZhengzaiParam
.
getName
(),
goblinStoreZhengzaiParam
.
getPerformanceId
(),
goblinStoreZhengzaiParam
.
getStartTime
(),
goblinStoreZhengzaiParam
.
getEndTime
());
return
goblinZhengzaiMarketService
.
zhengzaiInsert
(
goblinStoreZhengzaiParam
.
getName
(),
goblinStoreZhengzaiParam
.
getPerformanceId
(),
goblinStoreZhengzaiParam
.
get
PerformanceImg
(),
goblinStoreZhengzaiParam
.
get
StartTime
(),
goblinStoreZhengzaiParam
.
getEndTime
());
}
}
@PostMapping
(
"zhengzai/change"
)
@PostMapping
(
"zhengzai/change"
)
...
@@ -91,7 +91,7 @@ public class GoblinSelfZhengzaiController extends BaseController {
...
@@ -91,7 +91,7 @@ public class GoblinSelfZhengzaiController extends BaseController {
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ResponseBody
@ResponseBody
public
ResponseDto
<
String
>
purchasingUpdate
(
GoblinStoreZhengzaiParam
goblinStoreZhengzaiParam
)
{
public
ResponseDto
<
String
>
purchasingUpdate
(
GoblinStoreZhengzaiParam
goblinStoreZhengzaiParam
)
{
goblinZhengzaiMarketService
.
zhengzaiUpdate
(
goblinStoreZhengzaiParam
.
getMarketId
(),
goblinStoreZhengzaiParam
.
getName
(),
goblinStoreZhengzaiParam
.
getStartTime
(),
goblinStoreZhengzaiParam
.
getEndTime
());
goblinZhengzaiMarketService
.
zhengzaiUpdate
(
goblinStoreZhengzaiParam
.
getMarketId
(),
goblinStoreZhengzaiParam
.
getName
(),
goblinStoreZhengzaiParam
.
get
PerformanceId
(),
goblinStoreZhengzaiParam
.
getPerformanceImg
(),
goblinStoreZhengzaiParam
.
get
StartTime
(),
goblinStoreZhengzaiParam
.
getEndTime
());
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
}
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/IGoblinZhengzaiMarketService.java
View file @
017f2036
...
@@ -45,7 +45,7 @@ public interface IGoblinZhengzaiMarketService {
...
@@ -45,7 +45,7 @@ public interface IGoblinZhengzaiMarketService {
* @param et 结束时间
* @param et 结束时间
* @return
* @return
*/
*/
ResponseDto
<
String
>
zhengzaiInsert
(
String
purchaseName
,
String
performancesId
,
String
st
,
String
et
);
ResponseDto
<
String
>
zhengzaiInsert
(
String
purchaseName
,
String
performancesId
,
String
img
,
String
st
,
String
et
);
/**
/**
* @param marketId 活动id
* @param marketId 活动id
...
@@ -54,7 +54,7 @@ public interface IGoblinZhengzaiMarketService {
...
@@ -54,7 +54,7 @@ public interface IGoblinZhengzaiMarketService {
* @param et 结束时间
* @param et 结束时间
* @return
* @return
*/
*/
ResponseDto
<
Boolean
>
zhengzaiUpdate
(
String
marketId
,
String
purchaseName
,
String
st
,
String
et
);
ResponseDto
<
Boolean
>
zhengzaiUpdate
(
String
marketId
,
String
purchaseName
,
String
performanceId
,
String
img
,
String
st
,
String
et
);
/**
/**
* 获取 限时秒杀 详情
* 获取 限时秒杀 详情
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java
View file @
017f2036
...
@@ -110,7 +110,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -110,7 +110,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
}
}
@Override
@Override
public
ResponseDto
<
String
>
zhengzaiInsert
(
String
purchaseName
,
String
performanceId
,
String
st
,
String
et
)
{
public
ResponseDto
<
String
>
zhengzaiInsert
(
String
purchaseName
,
String
performanceId
,
String
img
,
String
st
,
String
et
)
{
GoblinSelfMarketing
selfMarketing
=
GoblinSelfMarketing
.
getNew
();
GoblinSelfMarketing
selfMarketing
=
GoblinSelfMarketing
.
getNew
();
String
SelfMarketId
=
IDGenerator
.
nextTimeId2
();
String
SelfMarketId
=
IDGenerator
.
nextTimeId2
();
selfMarketing
.
setSelfMarketId
(
SelfMarketId
);
selfMarketing
.
setSelfMarketId
(
SelfMarketId
);
...
@@ -127,6 +127,8 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -127,6 +127,8 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
BeanUtils
.
copyProperties
(
selfMarketing
,
vo
);
BeanUtils
.
copyProperties
(
selfMarketing
,
vo
);
vo
.
setStartTime
(
st
);
vo
.
setStartTime
(
st
);
vo
.
setEndTime
(
et
);
vo
.
setEndTime
(
et
);
vo
.
setPerformanceId
(
performanceId
);
vo
.
setPerformanceImg
(
img
);
vo
.
setCreatedAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
selfMarketing
.
getCreatedAt
()));
vo
.
setCreatedAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
selfMarketing
.
getCreatedAt
()));
goblinMongoUtils
.
insertSelfMarket
(
vo
);
goblinMongoUtils
.
insertSelfMarket
(
vo
);
//redis
//redis
...
@@ -136,7 +138,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -136,7 +138,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
}
}
@Override
@Override
public
ResponseDto
<
Boolean
>
zhengzaiUpdate
(
String
marketId
,
String
purchaseName
,
String
st
,
String
et
)
{
public
ResponseDto
<
Boolean
>
zhengzaiUpdate
(
String
marketId
,
String
purchaseName
,
String
performanceId
,
String
img
,
String
st
,
String
et
)
{
GoblinSelfMarketing
selfMarketing
=
GoblinSelfMarketing
.
getNew
();
GoblinSelfMarketing
selfMarketing
=
GoblinSelfMarketing
.
getNew
();
selfMarketing
.
setName
(
purchaseName
);
selfMarketing
.
setName
(
purchaseName
);
selfMarketing
.
setType
(
GoblinStatusConst
.
MarketingStatus
.
SELF_TYPE_ZHENGZAI
.
getValue
());
selfMarketing
.
setType
(
GoblinStatusConst
.
MarketingStatus
.
SELF_TYPE_ZHENGZAI
.
getValue
());
...
@@ -151,6 +153,8 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -151,6 +153,8 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
vo
.
setName
(
purchaseName
);
vo
.
setName
(
purchaseName
);
vo
.
setStartTime
(
st
);
vo
.
setStartTime
(
st
);
vo
.
setEndTime
(
et
);
vo
.
setEndTime
(
et
);
vo
.
setPerformanceImg
(
img
);
vo
.
setPerformanceId
(
performanceId
);
GoblinSelfMarketingVo
changeVo
=
goblinMongoUtils
.
updateSelfMarket
(
marketId
,
vo
);
GoblinSelfMarketingVo
changeVo
=
goblinMongoUtils
.
updateSelfMarket
(
marketId
,
vo
);
//redis
//redis
goblinRedisUtils
.
setSelfMarket
(
marketId
,
vo
);
goblinRedisUtils
.
setSelfMarket
(
marketId
,
vo
);
...
@@ -188,7 +192,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -188,7 +192,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
@Override
@Override
public
ResponseDto
<
Boolean
>
zhengzaiStore
(
List
<
GoblinInsertZhengzaiParam
>
params
)
{
public
ResponseDto
<
Boolean
>
zhengzaiStore
(
List
<
GoblinInsertZhengzaiParam
>
params
)
{
for
(
GoblinInsertZhengzaiParam
item
:
params
)
{
for
(
GoblinInsertZhengzaiParam
item
:
params
)
{
if
(
item
.
getNewTag
()==
1
)
{
//新增
if
(
item
.
getNewTag
()
==
1
)
{
//新增
String
marketId
=
item
.
getMarketId
();
String
marketId
=
item
.
getMarketId
();
String
storeId
=
item
.
getStoreId
();
String
storeId
=
item
.
getStoreId
();
String
showTime
=
item
.
getShowTime
();
String
showTime
=
item
.
getShowTime
();
...
@@ -210,7 +214,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -210,7 +214,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
//redis
//redis
goblinRedisUtils
.
setZhengzaiRelation
(
marketId
,
vo
);
goblinRedisUtils
.
setZhengzaiRelation
(
marketId
,
vo
);
goblinRedisUtils
.
addStoreSelfRelation
(
marketId
,
storeId
);
goblinRedisUtils
.
addStoreSelfRelation
(
marketId
,
storeId
);
}
else
{
//修改
}
else
{
//修改
int
delTag
=
item
.
getDelTag
();
int
delTag
=
item
.
getDelTag
();
String
showTime
=
item
.
getShowTime
();
String
showTime
=
item
.
getShowTime
();
String
marketId
=
item
.
getMarketId
();
String
marketId
=
item
.
getMarketId
();
...
@@ -249,7 +253,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -249,7 +253,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
@Override
@Override
public
ResponseDto
<
Boolean
>
zhengzaiStoreUpdate
(
List
<
GoblinInsertZhengzaiParam
>
params
)
{
public
ResponseDto
<
Boolean
>
zhengzaiStoreUpdate
(
List
<
GoblinInsertZhengzaiParam
>
params
)
{
for
(
GoblinInsertZhengzaiParam
item
:
params
)
{
for
(
GoblinInsertZhengzaiParam
item
:
params
)
{
int
delTag
=
item
.
getDelTag
();
int
delTag
=
item
.
getDelTag
();
String
showTime
=
item
.
getShowTime
();
String
showTime
=
item
.
getShowTime
();
String
marketId
=
item
.
getMarketId
();
String
marketId
=
item
.
getMarketId
();
...
@@ -292,7 +296,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -292,7 +296,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
params
.
add
(
"page"
,
page
+
""
);
params
.
add
(
"page"
,
page
+
""
);
MultiValueMap
<
String
,
String
>
headers
=
CollectionUtil
.
linkedMultiValueMapStringString
();
MultiValueMap
<
String
,
String
>
headers
=
CollectionUtil
.
linkedMultiValueMapStringString
();
headers
.
add
(
"Accept"
,
"application/json;charset=UTF-8"
);
headers
.
add
(
"Accept"
,
"application/json;charset=UTF-8"
);
String
returnData
=
HttpUtil
.
get
(
goblinUrl
+
"/goblin/inner/config/spu?page="
+
page
+
"&selfMarketId="
+
marketId
+
"&storeId="
+
storeId
,
params
,
headers
);
String
returnData
=
HttpUtil
.
get
(
goblinUrl
+
"/goblin/inner/config/spu?page="
+
page
+
"&selfMarketId="
+
marketId
+
"&storeId="
+
storeId
,
params
,
headers
);
ResponseDto
<
List
<
GoblinMarketSpuListVo
>>
rsp
=
JsonUtils
.
fromJson
(
returnData
,
new
TypeReference
<
ResponseDto
<
List
<
GoblinMarketSpuListVo
>>>()
{
ResponseDto
<
List
<
GoblinMarketSpuListVo
>>
rsp
=
JsonUtils
.
fromJson
(
returnData
,
new
TypeReference
<
ResponseDto
<
List
<
GoblinMarketSpuListVo
>>>()
{
});
});
return
rsp
;
return
rsp
;
...
@@ -306,7 +310,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
...
@@ -306,7 +310,7 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
params
.
add
(
"spuId"
,
spuId
);
params
.
add
(
"spuId"
,
spuId
);
MultiValueMap
<
String
,
String
>
headers
=
CollectionUtil
.
linkedMultiValueMapStringString
();
MultiValueMap
<
String
,
String
>
headers
=
CollectionUtil
.
linkedMultiValueMapStringString
();
headers
.
add
(
"Accept"
,
"application/json;charset=UTF-8"
);
headers
.
add
(
"Accept"
,
"application/json;charset=UTF-8"
);
String
returnData
=
HttpUtil
.
get
(
goblinUrl
+
"/goblin/inner/config/sku?selfMarketId="
+
marketId
+
"&storeId="
+
storeId
+
"&spuId="
+
spuId
,
params
,
headers
);
String
returnData
=
HttpUtil
.
get
(
goblinUrl
+
"/goblin/inner/config/sku?selfMarketId="
+
marketId
+
"&storeId="
+
storeId
+
"&spuId="
+
spuId
,
params
,
headers
);
ResponseDto
<
List
<
GoblinSelfZhengzaiSkuVo
>>
rsp
=
JsonUtils
.
fromJson
(
returnData
,
new
TypeReference
<
ResponseDto
<
List
<
GoblinSelfZhengzaiSkuVo
>>>()
{
ResponseDto
<
List
<
GoblinSelfZhengzaiSkuVo
>>
rsp
=
JsonUtils
.
fromJson
(
returnData
,
new
TypeReference
<
ResponseDto
<
List
<
GoblinSelfZhengzaiSkuVo
>>>()
{
});
});
return
rsp
;
return
rsp
;
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceTitleDao.java
View file @
017f2036
...
@@ -8,5 +8,6 @@ public class PerformanceTitleDao {
...
@@ -8,5 +8,6 @@ public class PerformanceTitleDao {
//演出数据
//演出数据
private
String
performancesId
;
private
String
performancesId
;
private
String
title
;
private
String
title
;
private
String
img_poster
;
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @
017f2036
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
<resultMap
id=
"performanceTitleDaoResult"
type=
"com.liquidnet.service.kylin.dao.PerformanceTitleDao"
>
<resultMap
id=
"performanceTitleDaoResult"
type=
"com.liquidnet.service.kylin.dao.PerformanceTitleDao"
>
<result
column=
"performances_id"
property=
"performancesId"
/>
<result
column=
"performances_id"
property=
"performancesId"
/>
<result
column=
"title"
property=
"title"
/>
<result
column=
"title"
property=
"title"
/>
<result
column=
"img_poster"
property=
"imgPoster"
/>
</resultMap>
</resultMap>
<resultMap
id=
"OrderExportDaoResult"
type=
"com.liquidnet.service.kylin.dao.OrderExportDao"
>
<resultMap
id=
"OrderExportDaoResult"
type=
"com.liquidnet.service.kylin.dao.OrderExportDao"
>
...
@@ -320,7 +321,8 @@
...
@@ -320,7 +321,8 @@
<!-- Mis 根据巡演查询演出列表 -->
<!-- Mis 根据巡演查询演出列表 -->
<select
id=
"misTitleByRoadShowIdList"
parameterType=
"java.lang.String"
resultMap=
"performanceTitleDaoResult"
>
<select
id=
"misTitleByRoadShowIdList"
parameterType=
"java.lang.String"
resultMap=
"performanceTitleDaoResult"
>
SELECT performances_id,
SELECT performances_id,
title
title,
img_poster
FROM kylin_performances AS p
FROM kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
...
@@ -331,7 +333,8 @@
...
@@ -331,7 +333,8 @@
<!-- Mis 根据状态查询演出列表 -->
<!-- Mis 根据状态查询演出列表 -->
<select
id=
"misTitleByStatusList"
parameterType=
"java.lang.String"
resultMap=
"performanceTitleDaoResult"
>
<select
id=
"misTitleByStatusList"
parameterType=
"java.lang.String"
resultMap=
"performanceTitleDaoResult"
>
SELECT performances_id,
SELECT performances_id,
title
title,
img_poster
FROM kylin_performances AS p
FROM kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
...
...
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