Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
9ef1580f
Commit
9ef1580f
authored
Sep 26, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:绑定的商户列表和门店列表
parent
5289be9a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
AuditController.java
...com/gic/haoban/manage/web/controller/AuditController.java
+16
-1
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+6
-1
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/AuditController.java
View file @
9ef1580f
...
...
@@ -8,8 +8,10 @@ import com.gic.api.base.commons.ServiceResponse;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.haoban.base.api.common.BasePageInfo
;
import
com.gic.haoban.base.api.common.PageResult2
;
import
com.gic.haoban.base.api.common.pojo.dto.WellDoneLoginDTO
;
import
com.gic.haoban.common.anno.HttpLimit
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.common.utils.PageUtil
;
...
...
@@ -273,7 +275,7 @@ public class AuditController extends WebBaseController {
staffClerkRelation
.
setStaffId
(
auditStaffId
);
ServiceResponse
serviceResponse
=
staffClerkRelationApiService
.
wxBindStaffClerk
(
staffClerkRelation
,
staffId
,
ChannelCodeEnum
.
AUDIT_BIND
.
getCode
());
if
(!
serviceResponse
.
isSuccess
())
{
return
resultResponse
(
HaoBanErrCode
.
ERR_DEFINE
,
serviceResponse
.
getMessage
());
return
resultResponse
(
HaoBanErrCode
.
ERR_DEFINE
,
serviceResponse
.
getMessage
());
}
audit
.
setAuditStatus
(
1
);
...
...
@@ -319,7 +321,20 @@ public class AuditController extends WebBaseController {
auditApiService
.
update
(
audit
);
RedisUtil
.
unlock
(
key
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
/**
* 审核数量
*
* @param clerkId
* @param enterpriseId
* @return
*/
@RequestMapping
(
"get-audit-count"
)
public
RestResponse
getAuditCount
(
String
clerkId
,
String
enterpriseId
)
{
WellDoneLoginDTO
loginUser
=
this
.
getLoginUser
();
int
count
=
this
.
auditApiService
.
getAuditCount
(
loginUser
.
getWxEnterpriseId
(),
enterpriseId
,
clerkId
);
return
RestResponse
.
successResult
(
count
);
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
9ef1580f
...
...
@@ -1445,7 +1445,12 @@ public class ClerkController extends WebBaseController {
return
RestResponse
.
successResult
(
list
);
}
/**
* 会员关联数量
* @param staffId
* @param statusFlags
* @return
*/
@RequestMapping
(
"external-friend-count"
)
public
HaobanResponse
friendCount
(
String
staffId
,
List
<
Integer
>
statusFlags
)
{
StaffDTO
staff
=
staffApiService
.
selectById
(
staffId
);
...
...
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