记得上下班打卡 | 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
e6737397
Commit
e6737397
authored
Dec 14, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~验票:上载数据更新+同步票务平台;
parent
aae58ad3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
97 additions
and
1 deletion
+97
-1
CheckVo.java
.../liquidnet/service/kylin/dto/vo/ticketSystem/CheckVo.java
+10
-0
pom.xml
liquidnet-bus-feign/liquidnet-api-feign-platform/pom.xml
+5
-1
FeignPlatformTicketSystemClient.java
...e/feign/platform/api/FeignPlatformTicketSystemClient.java
+24
-0
MerchantStationService.java
...service/merchant/service/impl/MerchantStationService.java
+52
-0
ObjectUtil.java
.../java/com/liquidnet/service/merchant/util/ObjectUtil.java
+6
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ticketSystem/CheckVo.java
View file @
e6737397
...
...
@@ -25,4 +25,14 @@ public class CheckVo implements Serializable {
private
Integer
checkingType
;
@ApiModelProperty
(
value
=
"是否实名[必传 1 实名,2 非实名]"
)
private
Integer
authType
;
private
static
final
CheckVo
obj
=
new
CheckVo
();
public
static
CheckVo
getNew
()
{
try
{
return
(
CheckVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
CheckVo
();
}
}
}
liquidnet-bus-feign/liquidnet-api-feign-platform/pom.xml
View file @
e6737397
...
...
@@ -17,7 +17,11 @@
</properties>
<dependencies>
<dependency>
<groupId>
com.liquidnet
</groupId>
<artifactId>
liquidnet-service-kylin-api
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/api/FeignPlatformTicketSystemClient.java
0 → 100644
View file @
e6737397
package
com
.
liquidnet
.
service
.
feign
.
platform
.
api
;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.CheckVo
;
import
feign.hystrix.FallbackFactory
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
java.util.List
;
@Component
@FeignClient
(
name
=
"liquidnet-service-platform"
,
contextId
=
"FeignPlatformTicketSystemClient"
,
path
=
"platform"
,
url
=
"${liquidnet.service.platform.url}"
,
fallback
=
FallbackFactory
.
Default
.
class
)
public
interface
FeignPlatformTicketSystemClient
{
@PostMapping
(
"st/check/insert"
)
void
insertCheck
(
@RequestBody
List
<
CheckVo
>
ticketList
);
}
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantStationService.java
View file @
e6737397
package
com
.
liquidnet
.
service
.
merchant
.
service
.
impl
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.feign.platform.api.FeignPlatformTicketSystemClient
;
import
com.liquidnet.service.kylin.constant.KylinRedisConst
;
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.CheckVo
;
import
com.liquidnet.service.merchant.constant.MerchantAuthorizationConst
;
import
com.liquidnet.service.merchant.dto.param.MerchantStationUploadParam
;
import
com.liquidnet.service.merchant.dto.vo.*
;
...
...
@@ -29,6 +33,7 @@ import org.springframework.util.CollectionUtils;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -42,6 +47,11 @@ public class MerchantStationService {
MongoTemplate
mongoTemplate
;
@Autowired
QueueUtil
queueUtil
;
@Autowired
RedisUtil
redisUtil
;
@Autowired
FeignPlatformTicketSystemClient
feignPlatformTicketSystemClient
;
/**
* 查取用户存在权限的演出
...
...
@@ -141,6 +151,7 @@ public class MerchantStationService {
LocalDateTime
nowDt
=
LocalDateTime
.
now
();
String
nowDtStr
=
DateUtil
.
format
(
nowDt
,
DateUtil
.
Formatter
.
yyyyMMddHHmmss
);
LinkedList
<
Object
[]>
paramsList
=
CollectionUtil
.
linkedListObjectArr
();
List
<
String
>
orderTicketEntitiesIdList
=
CollectionUtil
.
arrayListString
();
List
<
WriteModel
<
Document
>>
list
=
ObjectUtil
.
getWriteModelDocumentArrayList
();
parameter
.
getCheckOrderParamList
().
forEach
(
r
->
{
if
(
StringUtils
.
isNotBlank
(
r
.
getTicketEntitiesId
()))
{
...
...
@@ -161,6 +172,8 @@ public class MerchantStationService {
.
append
(
"checkedAt"
,
updateVo
.
getCheckedAt
())
.
append
(
"checkUserId"
,
updateVo
.
getUserId
());
list
.
add
(
new
UpdateOneModel
<>(
updateQuery
,
new
Document
(
"$set"
,
updateDoc
)));
orderTicketEntitiesIdList
.
add
(
r
.
getTicketEntitiesId
());
}
});
BulkWriteResult
bulkWriteResult
=
mongoTemplate
.
getCollection
(
KylinOrderTicketEntitiesVo
.
class
.
getSimpleName
()).
bulkWrite
(
list
);
...
...
@@ -168,9 +181,48 @@ public class MerchantStationService {
if
(
bulkWriteResult
.
getModifiedCount
()
>
0
)
{
queueUtil
.
sendMsgByRedis
(
MQConst
.
KylinQueue
.
SQL_STATION
.
getKey
(),
SqlMapping
.
get
(
"kylin_order_ticket_entities.update_status_bystation"
,
paramsList
));
/* ====================================== 同步票务系统 */
ArrayList
<
CheckVo
>
checkVos
=
ObjectUtil
.
getCheckVoArrayList
();
Query
orderTicketEntitiesVoQuery
=
Query
.
query
(
Criteria
.
where
(
"orderTicketEntitiesId"
).
in
(
orderTicketEntitiesIdList
));
orderTicketEntitiesVoQuery
.
fields
().
include
(
"ticketId"
).
include
(
"timeId"
).
include
(
"enterIdCode"
).
include
(
"checkedAt"
);
List
<
KylinOrderTicketEntitiesVo
>
checkOrderVos
=
mongoTemplate
.
find
(
orderTicketEntitiesVoQuery
,
KylinOrderTicketEntitiesVo
.
class
,
KylinOrderTicketEntitiesVo
.
class
.
getSimpleName
());
checkOrderVos
.
forEach
(
r
->
{
CheckVo
checkVo
=
CheckVo
.
getNew
();
checkVo
.
setTicketId
(
r
.
getTicketId
());
checkVo
.
setPriceId
(
this
.
getPriceId
(
r
.
getTicketId
()));
checkVo
.
setSessionId
(
r
.
getTimeId
());
checkVo
.
setSessionCode
(
this
.
getSessionCode
(
r
.
getTimeId
()));
checkVo
.
setCheckingTime
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
r
.
getCheckedAt
()));
checkVo
.
setCheckingType
(
1
);
checkVo
.
setAuthType
(
StringUtils
.
isEmpty
(
r
.
getEnterIdCode
())
?
2
:
1
);
checkVos
.
add
(
checkVo
);
});
if
(!
CollectionUtils
.
isEmpty
(
checkVos
))
{
try
{
feignPlatformTicketSystemClient
.
insertCheck
(
checkVos
);
}
catch
(
Exception
e
)
{
log
.
error
(
"验票:上载验票数据:同步票务系统请求异常"
);
}
}
/* ====================================== ========== */
}
}
/* ====================================== 同步票务系统使用:同Klin逻辑 ====================================== */
private
String
getSessionCode
(
String
ticketTimeId
)
{
return
(
String
)
redisUtil
.
get
(
KylinRedisConst
.
TIMES_SESSION_CODE
.
concat
(
ticketTimeId
));
}
private
String
getPriceId
(
String
ticketId
)
{
return
ticketId
.
concat
(
"01"
);
}
/* ====================================== ======================= ====================================== */
/**
* 下载、更新验票数据
*
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/ObjectUtil.java
View file @
e6737397
...
...
@@ -5,6 +5,7 @@ import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancePartnerListVo
;
import
com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo
;
import
com.liquidnet.service.kylin.dto.vo.ticketSystem.CheckVo
;
import
com.liquidnet.service.merchant.dto.vo.*
;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.client.model.WriteModel
;
...
...
@@ -37,6 +38,7 @@ public class ObjectUtil {
private
static
final
ArrayList
<
KylinPerformancePartnerListVo
>
performancePartnerListVo
=
new
ArrayList
<>();
private
static
final
ArrayList
<
MerchantAuthorizationPerformanceVo
>
permissionVoList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
KylinTicketVo
>
kylinTicketVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
CheckVo
>
checkVoArrayList
=
new
ArrayList
<>();
public
static
ArrayList
<
PerformancePartnerListDao
>
getPerformancePartnerListDaoArrayList
()
{
return
(
ArrayList
<
PerformancePartnerListDao
>)
performancePartnerListDaoArrayList
.
clone
();
...
...
@@ -101,4 +103,8 @@ public class ObjectUtil {
public
static
ArrayList
<
KylinTicketVo
>
getKylinTicketVoArrayList
()
{
return
(
ArrayList
<
KylinTicketVo
>)
kylinTicketVoArrayList
.
clone
();
}
public
static
ArrayList
<
CheckVo
>
getCheckVoArrayList
()
{
return
(
ArrayList
<
CheckVo
>)
checkVoArrayList
.
clone
();
}
}
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