记得上下班打卡 | 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
efedff0e
Commit
efedff0e
authored
Jul 29, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into test
parents
4be8a074
924cdb88
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
72 additions
and
58 deletions
+72
-58
KylinOrderTicketsServiceImpl.java
...vice/kylin/service/impl/KylinOrderTicketsServiceImpl.java
+4
-2
PerformancesExpressInfoServiceImpl.java
...ylin/service/impl/PerformancesExpressInfoServiceImpl.java
+0
-4
DataUtils.java
...ain/java/com/liquidnet/service/kylin/utils/DataUtils.java
+2
-1
SweetConstant.java
...a/com/liquidnet/service/sweet/constant/SweetConstant.java
+1
-0
SweetTemplateController.java
...net/service/sweet/controller/SweetTemplateController.java
+5
-15
SweetManualDto.java
.../java/com/liquidnet/service/sweet/dto/SweetManualDto.java
+1
-0
SweetManualServiceImpl.java
...et/service/sweet/service/impl/SweetManualServiceImpl.java
+1
-1
SweetTemplateServiceImpl.java
.../service/sweet/service/impl/SweetTemplateServiceImpl.java
+50
-30
RedisDataUtils.java
...ava/com/liquidnet/service/sweet/utils/RedisDataUtils.java
+5
-5
SweetRemindVo.java
...in/java/com/liquidnet/service/sweet/vo/SweetRemindVo.java
+1
-0
SweetManualMapper.xml
.../com/liquidnet/service/sweet/mapper/SweetManualMapper.xml
+2
-0
No files found.
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @
efedff0e
...
...
@@ -449,6 +449,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
KylinOrderTicketStatus
orderStatusTable
=
KylinOrderTicketStatus
.
getNew
();
log
.
info
(
"newStatus = "
+
newStatus
);
orderStatusTable
.
setStatus
(
newStatus
);
orderStatusTable
.
setUpdatedAt
(
time
);
sqlsDataA
.
add
(
new
Object
[]{
...
...
@@ -517,7 +518,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
// }
// }
log
.
info
(
"entitiesVo.getRefundPrice() = "
+
entitiesVo
.
getRefundPrice
());
log
.
info
(
"entitiesVo.getRefundPrice() = "
+
entitiesVo
.
getRefundPrice
());
BasicDBObject
entitiesObject
=
new
BasicDBObject
(
"$set"
,
JSON
.
parse
(
JsonUtils
.
toJson
(
kylinOrderTicketEntitiesVo
)));
mongoTemplate
.
getCollection
(
KylinOrderTicketEntitiesVo
.
class
.
getSimpleName
()).
updateOne
(
Query
.
query
(
Criteria
.
where
(
"orderTicketEntitiesId"
).
is
(
item
.
getOrderTicketEntitiesId
())).
getQueryObject
(),
...
...
@@ -544,6 +545,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
dataUtils
.
delOrderRefundVo
(
orderRefundsId
);
dataUtils
.
delOrderRefundVoByOrderId
(
orderTicketsId
);
dataUtils
.
delOrderTicketRedis
(
orderTicketsId
);
orderUtils
.
resetOrderListVo
(
CurrentUtil
.
getCurrentUid
(),
2
,
orderTicketsId
,
null
);
sqls
.
add
(
SqlMapping
.
get
(
"kylin_order_ticket_status.withDraw"
));
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/PerformancesExpressInfoServiceImpl.java
View file @
efedff0e
package
com
.
liquidnet
.
service
.
kylin
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo
;
import
com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo
;
import
com.liquidnet.service.kylin.entity.*
;
import
com.liquidnet.service.kylin.mapper.*
;
import
com.liquidnet.service.kylin.service.IKylinOrderExpress
;
import
com.liquidnet.service.kylin.utils.DataUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @
efedff0e
...
...
@@ -512,7 +512,8 @@ public class DataUtils {
Object
obj
=
redisUtil
.
get
(
redisKey
);
if
(
obj
==
null
)
{
List
<
KylinOrderExpressRouteVo
>
routeVoList
=
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"orderTicketsId"
).
is
(
orderTicketsId
)),
Query
.
query
(
Criteria
.
where
(
"orderTicketsId"
).
is
(
orderTicketsId
))
.
with
(
Sort
.
by
(
Sort
.
Direction
.
DESC
,
"createdAt"
)),
KylinOrderExpressRouteVo
.
class
,
KylinOrderExpressRouteVo
.
class
.
getSimpleName
()
);
redisUtil
.
set
(
redisKey
,
routeVoList
);
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java
View file @
efedff0e
...
...
@@ -14,6 +14,7 @@ public class SweetConstant {
public
final
static
String
REDIS_KEY_SWEET_ARTISTS_RELATION
=
"sweet:artists:relation:uid:"
;
public
final
static
String
REDIS_KEY_SWEET_REMIND
=
"sweet:remind:unionId:"
;
public
static
final
String
REDIS_KEY_SWEET_REMIND_ALL
=
"sweet:remind:unionId*"
;
public
enum
ManualPosition
{
POSITION_1
(
"艺人"
),
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetTemplateController.java
View file @
efedff0e
...
...
@@ -19,33 +19,23 @@ public class SweetTemplateController {
@GetMapping
(
"send"
)
@ApiOperation
(
"发送模版消息"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"code"
,
value
=
"微信code"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"encryptedData"
,
value
=
"encryptedData"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"iv"
,
value
=
"iv"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"Integer"
,
name
=
"type"
,
value
=
"1草莓 2五百里 3mdsk"
),
})
public
ResponseDto
send
(
@RequestParam
()
String
code
,
@RequestParam
()
String
encryptedData
,
@RequestParam
()
String
iv
,
@RequestParam
(
defaultValue
=
"1"
)
Integer
type
)
{
sweetTemplateService
.
sendMsg
();
return
ResponseDto
.
success
();
public
ResponseDto
send
()
{
return
sweetTemplateService
.
sendMsg
();
}
@PostMapping
(
"remind"
)
@ApiOperation
(
"提醒记录"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"openId"
,
value
=
"微信openId"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"unionId"
,
value
=
"微信unionId"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"performancesId"
,
value
=
"演出ID"
,
required
=
true
),
})
public
ResponseDto
remind
(
@RequestParam
()
String
openId
,
@RequestParam
()
String
unionId
,
@RequestParam
()
String
performancesId
)
{
return
sweetTemplateService
.
remind
(
unionId
,
performancesId
);
return
sweetTemplateService
.
remind
(
openId
,
unionId
,
performancesId
);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualDto.java
View file @
efedff0e
...
...
@@ -7,6 +7,7 @@ import java.io.Serializable;
@Data
public
class
SweetManualDto
implements
Serializable
,
Cloneable
{
private
String
manualId
;
private
String
performancesId
;
private
String
title
;
private
String
timeStart
;
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualServiceImpl.java
View file @
efedff0e
...
...
@@ -47,7 +47,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
PageHelper
.
startPage
(
page
,
size
);
HashMap
<
String
,
Object
>
map
=
CollectionUtil
.
mapStringObject
();
map
.
put
(
"title"
,
name
);
List
<
SweetManualDto
>
voList
=
sweetManualMapper
.
getManualList
(
BeanUtil
.
convertBeanToMap
(
map
)
);
List
<
SweetManualDto
>
voList
=
sweetManualMapper
.
getManualList
(
map
);
for
(
int
i
=
0
;
i
<
voList
.
size
();
i
++)
{
SweetManualDto
vo
=
voList
.
get
(
i
);
if
(
vo
.
getStatus
()
>=
6
&&
vo
.
getStatus
()
!=
7
)
{
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetTemplateServiceImpl.java
View file @
efedff0e
package
com
.
liquidnet
.
service
.
sweet
.
service
.
impl
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo
;
import
com.liquidnet.service.sweet.constant.SweetConstant
;
import
com.liquidnet.service.sweet.utils.RedisDataUtils
;
import
com.liquidnet.service.sweet.vo.SweetRemindVo
;
import
me.chanjar.weixin.common.error.WxErrorException
;
import
me.chanjar.weixin.mp.api.WxMpService
;
import
me.chanjar.weixin.mp.api.impl.WxMpServiceImpl
;
...
...
@@ -13,7 +17,12 @@ import me.chanjar.weixin.mp.config.WxMpConfigStorage;
import
me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
java.util.List
;
import
java.util.Set
;
/**
* <p>
...
...
@@ -33,15 +42,25 @@ public class SweetTemplateServiceImpl {
@Autowired
private
RedisDataUtils
redisDataUtils
;
@Autowired
private
RedisTemplate
redisTemplate
;
@Autowired
private
RedisUtil
redisUtil
;
@Autowired
private
FeignKylinPerformanceClient
feignKylinPerformanceClient
;
public
ResponseDto
send
(
String
openId
,
String
templateId
)
{
public
ResponseDto
send
(
String
templateId
)
{
String
redisKey
=
SweetConstant
.
REDIS_KEY_SWEET_REMIND_ALL
;
Set
<
String
>
keys
=
redisTemplate
.
keys
(
redisKey
);
Object
hkeys
=
redisUtil
.
hkeys
(
redisKey
);
if
(!
CollectionUtils
.
isEmpty
(
keys
))
{
for
(
String
rkey
:
keys
)
{
SweetRemindVo
remindInfo
=
(
SweetRemindVo
)
redisUtil
.
get
(
rkey
);
// 发送模板消息接口
WxMpTemplateMessage
templateMessage
=
WxMpTemplateMessage
.
builder
()
// 接收者openid
.
toUser
(
openId
)
.
toUser
(
remindInfo
.
getOpenId
()
)
// 模板id
.
templateId
(
templateId
)
// 模板跳转链接
...
...
@@ -62,14 +81,15 @@ public class SweetTemplateServiceImpl {
e
.
printStackTrace
();
}
System
.
out
.
println
(
msgId
);
}
}
return
ResponseDto
.
success
();
}
public
void
sendMsg
()
public
ResponseDto
sendMsg
()
{
String
openId
=
""
;
String
templateId
=
""
;
send
(
openId
,
templateId
);
String
templateId
=
"CNLDBZYQoDgTWudicx8WU81Jr9b6RyG9hmK4O0tpK-k"
;
return
send
(
templateId
);
}
private
WxMpConfigStorage
wxMpConfig
(
String
appId
,
String
appSecret
)
{
...
...
@@ -85,10 +105,10 @@ public class SweetTemplateServiceImpl {
return
service
;
}
public
ResponseDto
remind
(
String
unionId
,
String
performancesId
)
{
public
ResponseDto
remind
(
String
openId
,
String
unionId
,
String
performancesId
)
{
ResponseDto
<
KylinPerformanceVo
>
performanceVo
=
feignKylinPerformanceClient
.
detail
(
performancesId
);
KylinPerformanceVo
performanceInfo
=
performanceVo
.
getData
();
redisDataUtils
.
setSweetRemind
(
unionId
,
performancesId
,
performanceInfo
);
redisDataUtils
.
setSweetRemind
(
openId
,
unionId
,
performancesId
,
performanceInfo
);
return
ResponseDto
.
success
();
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
View file @
efedff0e
...
...
@@ -17,12 +17,10 @@ import com.liquidnet.service.sweet.entity.SweetRichtext;
import
com.liquidnet.service.sweet.mapper.*
;
import
com.liquidnet.service.sweet.vo.SweetArtistsRelationVo
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Component
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.*
;
@Component
public
class
RedisDataUtils
{
...
...
@@ -230,12 +228,13 @@ public class RedisDataUtils {
}
// 小程序演出提醒
public
void
setSweetRemind
(
String
unionId
,
String
performancesId
,
KylinPerformanceVo
performanceInfo
)
{
public
void
setSweetRemind
(
String
openId
,
String
unionId
,
String
performancesId
,
KylinPerformanceVo
performanceInfo
)
{
String
redisKey
=
SweetConstant
.
REDIS_KEY_SWEET_REMIND
.
concat
(
unionId
);
SweetRemindVo
sweetRemindVo
=
SweetRemindVo
.
getNew
();
sweetRemindVo
.
setCreatedAt
(
DateUtil
.
getNowTime
());
sweetRemindVo
.
setPerformancesId
(
performancesId
);
sweetRemindVo
.
setUnionId
(
unionId
);
sweetRemindVo
.
setOpenId
(
openId
);
if
(
null
!=
performanceInfo
)
{
sweetRemindVo
.
setFieldName
(
performanceInfo
.
getFieldName
());
...
...
@@ -245,4 +244,5 @@ public class RedisDataUtils {
}
redisUtil
.
set
(
redisKey
,
sweetRemindVo
);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetRemindVo.java
View file @
efedff0e
...
...
@@ -7,6 +7,7 @@ import java.io.Serializable;
@Data
public
class
SweetRemindVo
implements
Serializable
,
Cloneable
{
private
String
performancesId
;
private
String
openId
;
private
String
unionId
;
private
String
title
;
private
String
timeStart
;
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualMapper.xml
View file @
efedff0e
...
...
@@ -3,6 +3,7 @@
<mapper
namespace=
"com.liquidnet.service.sweet.mapper.SweetManualMapper"
>
<resultMap
id=
"partnerPerformanceListResult"
type=
"com.liquidnet.service.sweet.dto.SweetManualDto"
>
<result
column=
"manual_id"
property=
"manualId"
/>
<result
column=
"performances_id"
property=
"performancesId"
/>
<result
column=
"title"
property=
"title"
/>
<result
column=
"time_start"
property=
"timeStart"
/>
...
...
@@ -27,6 +28,7 @@
<!-- 电子手册列表 -->
<select
id=
"getManualList"
parameterType=
"java.util.Map"
resultMap=
"partnerPerformanceListResult"
>
SELECT
IFNULL(sm.manual_id,0) as 'manual_id',
p.performances_id ,
p.title ,
p.time_start ,
...
...
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