记得上下班打卡 | 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
01ddffb8
Commit
01ddffb8
authored
Dec 13, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交 上传场地
parent
489cd512
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
7 deletions
+73
-7
KylinRedisConst.java
...com/liquidnet/service/kylin/constant/KylinRedisConst.java
+2
-1
InnerService.java
...net/client/admin/zhengzai/kylin/service/InnerService.java
+63
-6
MerchantFieldAppliesAdminServiceImpl.java
...nt/service/impl/MerchantFieldAppliesAdminServiceImpl.java
+8
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @
01ddffb8
...
...
@@ -30,7 +30,8 @@ public class KylinRedisConst {
public
static
final
String
TICKET_EXPRESS_MODULE_P
=
"kylin:ticket:express_module:p:"
;
//票种快递票模板关联vo [第三方非线上]
public
static
final
String
TICKET_EXPRESS_MODULE
=
"kylin:ticket:express_module:"
;
//票种快递票模板关联vo [线上]
public
static
final
String
TIMES_SESSION_CODE
=
"kylin:ticketTime:"
;
//票种快递票模板关联vo [线上]
public
static
final
String
TIMES_SESSION_CODE
=
"kylin:ticketTime:"
;
//SESSIO_CPDE
public
static
final
String
TIMES_VENUE_CODE
=
"kylin:venue_code:"
;
//票种快递票模板关联vo [线上]
public
static
final
String
ORDER_TRANSFER
=
"kylin:order:transfer:uid:"
;
//订单导入失败key
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/InnerService.java
View file @
01ddffb8
...
...
@@ -16,10 +16,8 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo
;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.OrderVo
;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.TicketPriceVo
;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.TicketVo
;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.TimesVo
;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.*
;
import
com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
...
...
@@ -29,6 +27,7 @@ import java.math.BigDecimal;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
static
com
.
liquidnet
.
commons
.
lang
.
util
.
DateUtil
.
DTF_YMD_HMS
;
...
...
@@ -49,7 +48,7 @@ public class InnerService {
insertPerformanceParam
.
setPerformanceId
(
vo
.
getPerformancesId
());
insertPerformanceParam
.
setPerformanceName
(
vo
.
getTitle
());
if
(
approval
!=
null
)
{
insertPerformanceParam
.
setApproval
(
approval
);
//TODO 批文号
insertPerformanceParam
.
setApproval
(
approval
);
}
insertPerformanceParam
.
setTypeId
(
vo
.
getType
()
==
101
?
2002
:
2003
);
insertPerformanceParam
.
setPosterUrl
(
vo
.
getImgPoster
());
...
...
@@ -61,7 +60,7 @@ public class InnerService {
TimesVo
timesVo
=
TimesVo
.
getNew
();
timesVo
.
setSessionId
(
item
.
getTicketTimesId
());
timesVo
.
setSessionName
(
item
.
getTitle
());
timesVo
.
setHallCode
(
"320412009"
);
//TODO
timesVo
.
setHallCode
(
getVenueCode
(
vo
.
getFieldId
()));
timesVo
.
setSessionStartTime
(
item
.
getUseStart
());
String
endTime
=
LocalDateTime
.
parse
(
item
.
getUseEnd
()
==
null
?
timesVo
.
getSessionStartTime
()
:
item
.
getUseEnd
(),
DTF_YMD_HMS
).
plusDays
(
1
).
minusSeconds
(
1L
).
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
));
timesVo
.
setSessionEndTime
(
endTime
);
...
...
@@ -174,6 +173,51 @@ public class InnerService {
return
innerReturnVo
.
getData
();
}
//上报场地
public
boolean
reportField
(
MerchantFieldsVo
vo
)
{
try
{
MultiValueMap
<
String
,
String
>
headers
=
CollectionUtil
.
linkedMultiValueMapStringString
();
headers
.
add
(
"Accept"
,
"application/json;charset=UTF-8"
);
HashMap
<
String
,
String
>
params
=
CollectionUtil
.
mapStringString
();
params
.
put
(
"provinceId"
,
vo
.
getProvinceId
());
params
.
put
(
"cityId"
,
vo
.
getCityId
());
params
.
put
(
"districtId"
,
vo
.
getDistrictId
());
params
.
put
(
"pageNo"
,
"1"
);
params
.
put
(
"pageSize"
,
"40"
);
params
.
put
(
"venueName"
,
vo
.
getName
());
String
json
=
HttpUtil
.
getRaw
(
platform
+
"/platform/st/field/list?provinceId={provinceId}&cityId={cityId}&districtId={districtId}&pageNo={pageNo}&pageSize={pageSize}&venueName={venueName}"
,
JSON
.
toJSONString
(
params
),
headers
);
ResponseDataVo
<
List
<
STFieldListVo
>>
response
=
JsonUtils
.
fromJson
(
json
,
new
TypeReference
<
ResponseDataVo
<
List
<
STFieldListVo
>>>()
{
});
STInsertFieldParam
insertTicketParam
=
STInsertFieldParam
.
getNew
();
insertTicketParam
.
setVenueCode
(
getVenueCode
(
vo
.
getFieldId
()));
insertTicketParam
.
setProvinceId
(
Integer
.
parseInt
(
vo
.
getProvinceId
()));
insertTicketParam
.
setCityId
(
Integer
.
parseInt
(
vo
.
getCityId
()));
insertTicketParam
.
setDistrictId
(
Integer
.
parseInt
(
vo
.
getDistrictId
()));
insertTicketParam
.
setVenueName
(
vo
.
getName
());
insertTicketParam
.
setVenueAddress
(
vo
.
getAddress
());
insertTicketParam
.
setManagementCompany
(
null
);
insertTicketParam
.
setHasHall
(
0
);
insertTicketParam
.
setHallName
(
null
);
insertTicketParam
.
setHasSeat
(
null
);
insertTicketParam
.
setSeatNum
(
null
);
insertTicketParam
.
setSeatingCapacity
(
null
);
MultiValueMap
<
String
,
String
>
header
=
CollectionUtil
.
linkedMultiValueMapStringString
();
header
.
add
(
"Accept"
,
"application/json;charset=UTF-8"
);
String
resultData
=
HttpUtil
.
postRaw
(
platform
+
"/platform/st/field/insert"
,
JSON
.
toJSONString
(
insertTicketParam
),
header
);
ResponseDto
<
STFieldChangeVo
>
innerReturnVo
=
JsonUtils
.
fromJson
(
resultData
,
new
TypeReference
<
ResponseDto
<
STFieldChangeVo
>>()
{
});
setVenueCode
(
vo
.
getFieldId
(),
innerReturnVo
.
getData
().
getVenueCode
());
return
true
;
}
catch
(
Exception
e
)
{
return
false
;
}
}
//设置SessionCode
private
void
setSessionCode
(
String
ticketTimeId
,
String
sessionCode
)
{
redisUtil
.
set
(
KylinRedisConst
.
TIMES_SESSION_CODE
.
concat
(
ticketTimeId
),
sessionCode
);
...
...
@@ -187,4 +231,17 @@ public class InnerService {
private
String
getPriceId
(
String
ticketId
)
{
return
ticketId
.
concat
(
"01"
);
}
private
String
getVenueCode
(
String
fieldId
)
{
Object
obj
=
redisUtil
.
get
(
KylinRedisConst
.
TIMES_VENUE_CODE
.
concat
(
fieldId
));
if
(
obj
==
null
)
{
return
null
;
}
else
{
return
(
String
)
obj
;
}
}
private
void
setVenueCode
(
String
fieldId
,
String
venueCode
)
{
redisUtil
.
set
(
KylinRedisConst
.
TIMES_VENUE_CODE
.
concat
(
fieldId
),
venueCode
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/service/impl/MerchantFieldAppliesAdminServiceImpl.java
View file @
01ddffb8
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.client.admin.zhengzai.kylin.service.InnerService
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldAppliesAdminService
;
import
com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService
;
...
...
@@ -34,6 +35,9 @@ import java.util.List;
@Service
public
class
MerchantFieldAppliesAdminServiceImpl
extends
ServiceImpl
<
MerchantFieldAppliesMapper
,
MerchantFieldApplies
>
implements
IMerchantFieldAppliesAdminService
{
@Autowired
InnerService
innerService
;
@Autowired
MerchantRedisUtil
merchantRedisUtil
;
...
...
@@ -180,6 +184,8 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
// 场地申请 sync redis
List
<
MerchantFieldAppliesVo
>
fieldAppliesVos
=
merchantRedisUtil
.
getFieldAppliesVosByUid
(
fieldAppliesVo
.
getUid
());
merchantRedisUtil
.
setFieldAppliesVoByUid
(
fieldAppliesVo
.
getUid
(),
fieldAppliesVos
,
fieldAppliesVo
);
//上传场地
innerService
.
reportField
(
fieldsVo
);
}
else
{
// 创建逻辑
...
...
@@ -287,6 +293,8 @@ public class MerchantFieldAppliesAdminServiceImpl extends ServiceImpl<MerchantFi
// 场地申请 sync redis
List
<
MerchantFieldAppliesVo
>
fieldAppliesVos
=
merchantRedisUtil
.
getFieldAppliesVosByUid
(
fieldAppliesVo
.
getUid
());
merchantRedisUtil
.
setFieldAppliesVoByUid
(
fieldAppliesVo
.
getUid
(),
fieldAppliesVos
,
fieldAppliesVo
);
//上传场地
innerService
.
reportField
(
fieldsVo
);
}
return
true
;
...
...
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