Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fit-finance
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fitness-server
fit-finance
Commits
09f9df3a
Commit
09f9df3a
authored
Apr 19, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:sync auth
parent
65b619a2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
55 additions
and
0 deletions
+55
-0
api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApi.java
+4
-0
api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApiFallback.java
+6
-0
app/src/main/java/com/jiejing/fitness/finance/app/controller/merchant/StudioMerchantController.java
+10
-0
service/src/main/java/com/jiejing/fitness/finance/service/merchant/StudioMerchantService.java
+11
-0
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
+12
-0
service/src/main/java/com/jiejing/fitness/finance/service/rpc/MerchantRpcService.java
+12
-0
No files found.
api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApi.java
View file @
09f9df3a
...
@@ -69,6 +69,10 @@ public interface StudioMerchantApi {
...
@@ -69,6 +69,10 @@ public interface StudioMerchantApi {
@PostMapping
(
value
=
"/private/studioMerchant/authSubChannel"
)
@PostMapping
(
value
=
"/private/studioMerchant/authSubChannel"
)
JsonResult
<
StudioMerchantAuthSubChannelVO
>
authSubChannel
(
AuthStudioSubChannelRequest
request
);
JsonResult
<
StudioMerchantAuthSubChannelVO
>
authSubChannel
(
AuthStudioSubChannelRequest
request
);
@ApiOperation
(
value
=
"同步子渠道授权状态"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioMerchant/syncAuthSubChannel"
)
JsonResult
<
StudioMerchantAuthSubChannelVO
>
syncAuthSubChannel
(
AuthStudioSubChannelRequest
request
);
@ApiOperation
(
value
=
"查询授权子渠道结果"
,
tags
=
{
TAG
})
@ApiOperation
(
value
=
"查询授权子渠道结果"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioMerchant/listAuthSubChannel"
)
@PostMapping
(
value
=
"/private/studioMerchant/listAuthSubChannel"
)
JsonResult
<
List
<
StudioMerchantAuthSubChannelVO
>>
listAuthSubChannel
(
GetAuthStudioSubChannelRequest
request
);
JsonResult
<
List
<
StudioMerchantAuthSubChannelVO
>>
listAuthSubChannel
(
GetAuthStudioSubChannelRequest
request
);
...
...
api/src/main/java/com/jiejing/fitness/finance/api/merchant/StudioMerchantApiFallback.java
View file @
09f9df3a
...
@@ -80,6 +80,12 @@ public class StudioMerchantApiFallback implements FallbackFactory<StudioMerchant
...
@@ -80,6 +80,12 @@ public class StudioMerchantApiFallback implements FallbackFactory<StudioMerchant
}
}
@Override
@Override
public
JsonResult
<
StudioMerchantAuthSubChannelVO
>
syncAuthSubChannel
(
AuthStudioSubChannelRequest
request
)
{
return
JsonResult
.
rpcError
();
}
@Override
public
JsonResult
<
List
<
StudioMerchantAuthSubChannelVO
>>
listAuthSubChannel
(
public
JsonResult
<
List
<
StudioMerchantAuthSubChannelVO
>>
listAuthSubChannel
(
GetAuthStudioSubChannelRequest
request
)
{
GetAuthStudioSubChannelRequest
request
)
{
return
JsonResult
.
rpcError
();
return
JsonResult
.
rpcError
();
...
...
app/src/main/java/com/jiejing/fitness/finance/app/controller/merchant/StudioMerchantController.java
View file @
09f9df3a
...
@@ -121,6 +121,16 @@ public class StudioMerchantController implements StudioMerchantApi {
...
@@ -121,6 +121,16 @@ public class StudioMerchantController implements StudioMerchantApi {
request
.
getAuthType
()));
request
.
getAuthType
()));
}
}
@ApiOperation
(
value
=
"同步子渠道授权状态"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioMerchant/syncAuthSubChannel"
)
@Override
public
JsonResult
<
StudioMerchantAuthSubChannelVO
>
syncAuthSubChannel
(
@RequestBody
@Valid
AuthStudioSubChannelRequest
request
)
{
return
JsonResult
.
success
(
studioMerchantService
.
syncAuthSubChannel
(
request
.
getStudioId
(),
request
.
getSubChannel
(),
request
.
getAuthType
()));
}
@ApiOperation
(
value
=
"查询授权子渠道结果"
,
tags
=
{
TAG
})
@ApiOperation
(
value
=
"查询授权子渠道结果"
,
tags
=
{
TAG
})
@PostMapping
(
value
=
"/private/studioMerchant/listAuthSubChannel"
)
@PostMapping
(
value
=
"/private/studioMerchant/listAuthSubChannel"
)
@Override
@Override
...
...
service/src/main/java/com/jiejing/fitness/finance/service/merchant/StudioMerchantService.java
View file @
09f9df3a
...
@@ -109,6 +109,17 @@ public interface StudioMerchantService {
...
@@ -109,6 +109,17 @@ public interface StudioMerchantService {
SubChannelAuthTypeEnums
authType
);
SubChannelAuthTypeEnums
authType
);
/**
/**
* 同步认证状态
*
* @param studioId 场馆ID
* @param subChannel 子渠道
* @param authType 授权类型
* @return 认证状态
*/
StudioMerchantAuthSubChannelVO
syncAuthSubChannel
(
Long
studioId
,
SubChannelEnums
subChannel
,
SubChannelAuthTypeEnums
authType
);
/**
* 查询授权子渠道结果
* 查询授权子渠道结果
*
*
* @param studioId 场馆ID
* @param studioId 场馆ID
...
...
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
View file @
09f9df3a
...
@@ -249,6 +249,18 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
...
@@ -249,6 +249,18 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
}
}
@Override
@Override
public
StudioMerchantAuthSubChannelVO
syncAuthSubChannel
(
Long
studioId
,
SubChannelEnums
subChannel
,
SubChannelAuthTypeEnums
authType
)
{
PartyToMerchant
relation
=
getRelation
(
studioId
);
if
(
null
==
relation
)
{
throw
new
BizException
(
FinanceErrorEnums
.
MERCHANT_NOT_OPEN
);
}
AuthSubChannelVO
vo
=
merchantRpcService
.
syncAuthSubChannel
(
relation
.
getMerchantId
(),
subChannel
,
authType
);
return
BeanUtil
.
map
(
vo
,
StudioMerchantAuthSubChannelVO
.
class
);
}
@Override
public
List
<
StudioMerchantAuthSubChannelVO
>
listAuthSubChannel
(
Long
studioId
)
{
public
List
<
StudioMerchantAuthSubChannelVO
>
listAuthSubChannel
(
Long
studioId
)
{
PartyToMerchant
relation
=
getRelation
(
studioId
);
PartyToMerchant
relation
=
getRelation
(
studioId
);
if
(
null
==
relation
)
{
if
(
null
==
relation
)
{
...
...
service/src/main/java/com/jiejing/fitness/finance/service/rpc/MerchantRpcService.java
View file @
09f9df3a
...
@@ -9,6 +9,7 @@ import com.jiejing.paycenter.api.merchant.request.AuthSubChannelRequest;
...
@@ -9,6 +9,7 @@ import com.jiejing.paycenter.api.merchant.request.AuthSubChannelRequest;
import
com.jiejing.paycenter.api.merchant.request.ConfigSubChannelRequest
;
import
com.jiejing.paycenter.api.merchant.request.ConfigSubChannelRequest
;
import
com.jiejing.paycenter.api.merchant.request.GetMerchantByIdRequest
;
import
com.jiejing.paycenter.api.merchant.request.GetMerchantByIdRequest
;
import
com.jiejing.paycenter.api.merchant.request.ListMerchantByIdsRequest
;
import
com.jiejing.paycenter.api.merchant.request.ListMerchantByIdsRequest
;
import
com.jiejing.paycenter.api.merchant.request.SyncSubChannelAuthRequest
;
import
com.jiejing.paycenter.api.merchant.request.UploadRequest
;
import
com.jiejing.paycenter.api.merchant.request.UploadRequest
;
import
com.jiejing.paycenter.common.model.vo.ApplyMerchantResultVO
;
import
com.jiejing.paycenter.common.model.vo.ApplyMerchantResultVO
;
import
com.jiejing.paycenter.common.model.vo.AuthSubChannelVO
;
import
com.jiejing.paycenter.common.model.vo.AuthSubChannelVO
;
...
@@ -92,6 +93,17 @@ public class MerchantRpcService {
...
@@ -92,6 +93,17 @@ public class MerchantRpcService {
return
result
.
getResult
();
return
result
.
getResult
();
}
}
public
AuthSubChannelVO
syncAuthSubChannel
(
Long
merchantId
,
SubChannelEnums
subChannel
,
SubChannelAuthTypeEnums
authType
)
{
JsonResult
<
AuthSubChannelVO
>
result
=
merchantApi
.
syncAuthSubChannel
(
SyncSubChannelAuthRequest
.
builder
()
.
merchantId
(
merchantId
)
.
subChannel
(
subChannel
)
.
authType
(
authType
)
.
build
());
return
result
.
getResult
();
}
public
List
<
MerchantVO
>
listByIds
(
List
<
Long
>
merchantIds
)
{
public
List
<
MerchantVO
>
listByIds
(
List
<
Long
>
merchantIds
)
{
ListMerchantByIdsRequest
request
=
new
ListMerchantByIdsRequest
();
ListMerchantByIdsRequest
request
=
new
ListMerchantByIdsRequest
();
request
.
setMerchantIds
(
merchantIds
);
request
.
setMerchantIds
(
merchantIds
);
...
...
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