记得上下班打卡 | 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
8369a596
Commit
8369a596
authored
Mar 07, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+购买会员成功、退会员同步kylin.redis缓存会员信息逻辑;
parent
8c66935a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
13 deletions
+39
-13
AdamMemberOrderAdminServiceImpl.java
...ai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
+16
-3
liquidnet-service-kylin.yml
...t-bus-config/liquidnet-config/liquidnet-service-kylin.yml
+1
-0
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+11
-0
InnerController.java
...m/liquidnet/service/kylin/controller/InnerController.java
+6
-6
PlatformMemberRefundService.java
...atform/service/impl/adam/PlatformMemberRefundService.java
+5
-4
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
View file @
8369a596
...
@@ -71,6 +71,8 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
...
@@ -71,6 +71,8 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
private
String
applyUrl
;
private
String
applyUrl
;
@Value
(
"${liquidnet.service.platform.urls.memberRefundNotify}"
)
@Value
(
"${liquidnet.service.platform.urls.memberRefundNotify}"
)
private
String
notifyUrl
;
private
String
notifyUrl
;
@Value
(
"${liquidnet.service.kylin.url}"
)
private
String
serviceKylinUrl
;
@Override
@Override
public
List
<
MemberOrderDto
>
getMemberOrderList
(
MemberOrderListReq
memberOrderListReq
)
{
public
List
<
MemberOrderDto
>
getMemberOrderList
(
MemberOrderListReq
memberOrderListReq
)
{
...
@@ -208,6 +210,12 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
...
@@ -208,6 +210,12 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
reason
=
existsRefund
.
getRefundReason
();
reason
=
existsRefund
.
getRefundReason
();
}
}
try
{
HttpUtil
.
post
(
serviceKylinUrl
+
"/inner/cache/member?uid="
.
concat
(
memberOrder
.
getUid
()),
CollectionUtil
.
linkedMultiValueMapStringString
());
}
catch
(
Exception
e
)
{
log
.
error
(
"会员管理:会员订单:退款:同步Kylin会员缓存异常[UID={}]"
,
memberOrder
.
getUid
());
}
LinkedMultiValueMap
<
String
,
String
>
linkedMultiValueMap
=
new
LinkedMultiValueMap
<>();
LinkedMultiValueMap
<
String
,
String
>
linkedMultiValueMap
=
new
LinkedMultiValueMap
<>();
linkedMultiValueMap
.
add
(
"code"
,
memberOrder
.
getPayNo
());
linkedMultiValueMap
.
add
(
"code"
,
memberOrder
.
getPayNo
());
linkedMultiValueMap
.
add
(
"notifyUrl"
,
notifyUrl
);
linkedMultiValueMap
.
add
(
"notifyUrl"
,
notifyUrl
);
...
@@ -222,11 +230,16 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
...
@@ -222,11 +230,16 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
linkedMultiheadersMap
.
add
(
"Accept"
,
MediaType
.
APPLICATION_JSON_UTF8_VALUE
);
linkedMultiheadersMap
.
add
(
"Accept"
,
MediaType
.
APPLICATION_JSON_UTF8_VALUE
);
log
.
info
(
"会员管理:会员订单:退款:支付中心请求参数:{}"
,
linkedMultiValueMap
);
log
.
info
(
"会员管理:会员订单:退款:支付中心请求参数:{}"
,
linkedMultiValueMap
);
String
postResult
=
HttpUtil
.
post
(
applyUrl
,
linkedMultiValueMap
,
linkedMultiheadersMap
);
String
postResult
=
null
;
log
.
info
(
"会员管理:会员订单:退款:支付中心返回数据:{}"
,
postResult
);
try
{
postResult
=
HttpUtil
.
post
(
applyUrl
,
linkedMultiValueMap
,
linkedMultiheadersMap
);
log
.
info
(
"会员管理:会员订单:退款:支付中心返回数据:{}"
,
postResult
);
}
catch
(
Exception
e
)
{
log
.
error
(
"会员管理:会员订单:退款:支付中心请求异常"
);
}
JsonNode
postResultJNode
=
JsonUtils
.
fromJson
(
postResult
,
JsonNode
.
class
);
JsonNode
postResultJNode
=
JsonUtils
.
fromJson
(
postResult
,
JsonNode
.
class
);
if
(!
postResultJNode
.
get
(
"success"
).
asBoolean
())
{
if
(
null
==
postResultJNode
||
!
postResultJNode
.
get
(
"success"
).
asBoolean
())
{
return
AjaxResult
.
warn
(
"会员退款请求支付中心失败"
);
return
AjaxResult
.
warn
(
"会员退款请求支付中心失败"
);
}
}
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml
View file @
8369a596
...
@@ -128,6 +128,7 @@ global-auth:
...
@@ -128,6 +128,7 @@ global-auth:
-
${liquidnet.info.context}/myPerformance/*
-
${liquidnet.info.context}/myPerformance/*
# 场地摄像头列表
# 场地摄像头列表
-
${liquidnet.info.context}/camera/list
-
${liquidnet.info.context}/camera/list
-
${liquidnet.info.context}/inner/**
oncheck-url-pattern
:
oncheck-url-pattern
:
-
${liquidnet.info.context}/order/details
-
${liquidnet.info.context}/order/details
-
${liquidnet.info.context}/order/transfer*
-
${liquidnet.info.context}/order/transfer*
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
8369a596
...
@@ -20,6 +20,7 @@ import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
...
@@ -20,6 +20,7 @@ import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.env.Environment
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
...
@@ -45,6 +46,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
...
@@ -45,6 +46,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
@Autowired
@Autowired
FeignStoneIntegralClient
feignStoneIntegralClient
;
FeignStoneIntegralClient
feignStoneIntegralClient
;
@Value
(
"${liquidnet.service.kylin.url}"
)
private
String
serviceKylinUrl
;
@Override
@Override
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public
ResponseDto
<
AdamMemberOrderResult
>
buyMemberOrMemberCode
(
String
currentUid
,
AdamMemberOrderParam
param
)
{
public
ResponseDto
<
AdamMemberOrderResult
>
buyMemberOrMemberCode
(
String
currentUid
,
AdamMemberOrderParam
param
)
{
...
@@ -382,6 +387,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
...
@@ -382,6 +387,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
queueUtils
.
sendMsgByRedis
(
MQConst
.
AdamQueue
.
SMS_NOTICE
.
getKey
(),
SmsMessage
.
builder
().
setPhone
(
userInfoVo
.
getMobile
())
queueUtils
.
sendMsgByRedis
(
MQConst
.
AdamQueue
.
SMS_NOTICE
.
getKey
(),
SmsMessage
.
builder
().
setPhone
(
userInfoVo
.
getMobile
())
.
setSignName
(
SmsEnum
.
ADSignName
.
M01
.
getVal
()).
setTemplateCode
(
SmsEnum
.
ADTemplate
.
SMS_232908714
.
name
()).
toJson
()
.
setSignName
(
SmsEnum
.
ADSignName
.
M01
.
getVal
()).
setTemplateCode
(
SmsEnum
.
ADTemplate
.
SMS_232908714
.
name
()).
toJson
()
);
);
try
{
HttpUtil
.
post
(
serviceKylinUrl
+
"/inner/cache/member?uid="
.
concat
(
handleMemberOrderVo
.
getUid
()),
CollectionUtil
.
linkedMultiValueMapStringString
());
}
catch
(
Exception
e
)
{
log
.
error
(
"购买会员支付回调处理成功:同步Kylin会员缓存异常[UID={}]"
,
handleMemberOrderVo
.
getUid
());
}
return
ResponseDto
.
success
();
return
ResponseDto
.
success
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"购买会员支付回调处理异常[CallbackParam={}]"
,
JsonUtils
.
toJson
(
parameter
),
e
);
log
.
error
(
"购买会员支付回调处理异常[CallbackParam={}]"
,
JsonUtils
.
toJson
(
parameter
),
e
);
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/InnerController.java
View file @
8369a596
package
com
.
liquidnet
.
service
.
kylin
.
controller
;
package
com
.
liquidnet
.
service
.
kylin
.
controller
;
import
ch.qos.logback.core.util.Duration
;
import
com.liquidnet.service.adam.dto.vo.AdamMemberVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserMemberVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserMemberVo
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.feign.adam.api.FeignAdamBaseClient
;
import
com.liquidnet.service.feign.adam.api.FeignAdamBaseClient
;
import
com.liquidnet.service.kylin.entity.KylinBanners
;
import
com.liquidnet.service.kylin.utils.DataUtils
;
import
com.liquidnet.service.kylin.utils.DataUtils
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
...
@@ -13,7 +10,10 @@ import io.swagger.annotations.ApiImplicitParams;
...
@@ -13,7 +10,10 @@ import io.swagger.annotations.ApiImplicitParams;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.temporal.ChronoUnit
;
import
java.time.temporal.ChronoUnit
;
...
@@ -28,12 +28,12 @@ public class InnerController {
...
@@ -28,12 +28,12 @@ public class InnerController {
@Autowired
@Autowired
FeignAdamBaseClient
adamBaseClient
;
FeignAdamBaseClient
adamBaseClient
;
@PostMapping
(
"
sav
e/member"
)
@PostMapping
(
"
cach
e/member"
)
@ApiOperation
(
"获取会员相关数据"
)
@ApiOperation
(
"获取会员相关数据"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"会员id"
),
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"uid"
,
value
=
"会员id"
),
})
})
public
void
sav
eMember
(
@RequestParam
(
"uid"
)
String
uid
)
{
public
void
cach
eMember
(
@RequestParam
(
"uid"
)
String
uid
)
{
try
{
try
{
ResponseDto
<
AdamUserMemberVo
>
memberVo
=
adamBaseClient
.
queryMember
(
uid
);
ResponseDto
<
AdamUserMemberVo
>
memberVo
=
adamBaseClient
.
queryMember
(
uid
);
AdamUserMemberVo
userMemberVo
=
memberVo
.
getData
();
AdamUserMemberVo
userMemberVo
=
memberVo
.
getData
();
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java
View file @
8369a596
...
@@ -7,7 +7,6 @@ import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
...
@@ -7,7 +7,6 @@ import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
import
com.liquidnet.common.cache.redis.util.RedisDataSourceUtil
;
import
com.liquidnet.common.cache.redis.util.RedisDataSourceUtil
;
import
com.liquidnet.service.adam.constant.AdamRedisConst
;
import
com.liquidnet.service.adam.constant.AdamRedisConst
;
import
com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo
;
import
com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserInfoVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserMemberVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserMemberVo
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
import
com.liquidnet.service.adam.entity.AdamMemberRefund
;
import
com.liquidnet.service.adam.entity.AdamMemberRefund
;
...
@@ -43,10 +42,8 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
...
@@ -43,10 +42,8 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
private
AdamUserMemberMapper
adamUserMemberMapper
;
private
AdamUserMemberMapper
adamUserMemberMapper
;
@Autowired
@Autowired
private
CandyUserCouponMapper
candyUserCouponMapper
;
private
CandyUserCouponMapper
candyUserCouponMapper
;
@Autowired
@Autowired
private
RedisDataSourceUtil
redisDataSourceUtil
;
private
RedisDataSourceUtil
redisDataSourceUtil
;
@Autowired
@Autowired
FeignStoneIntegralClient
feignStoneIntegralClient
;
FeignStoneIntegralClient
feignStoneIntegralClient
;
...
@@ -197,6 +194,10 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
...
@@ -197,6 +194,10 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
int
updateRst
=
adamMemberOrderMapper
.
updateById
(
updateInfoMemberOrder
);
int
updateRst
=
adamMemberOrderMapper
.
updateById
(
updateInfoMemberOrder
);
log
.
info
(
"###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]"
,
updateRst
<=
0
?
"失败"
:
"成功"
,
orderNo
);
log
.
info
(
"###会员退款回调处理成功:更新DB订单信息{}[orderNo:{}]"
,
updateRst
<=
0
?
"失败"
:
"成功"
,
orderNo
);
feignStoneIntegralClient
.
de2111
(
memberOrder
.
getUid
(),
new
BigDecimal
(
refundAmt
).
intValue
(),
"会员注销"
);
try
{
feignStoneIntegralClient
.
de2111
(
memberOrder
.
getUid
(),
new
BigDecimal
(
refundAmt
).
intValue
(),
"会员注销"
);
}
catch
(
Exception
e
)
{
log
.
error
(
"###会员退款回调处理成功:减积分调用API异常[UID={},refundAmt={}]"
,
memberOrder
.
getUid
(),
refundAmt
);
}
}
}
}
}
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