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
07d1d007
Commit
07d1d007
authored
Apr 20, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
435e006b
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
43 additions
and
1 deletions
+43
-1
WxEnterpriseDTO.java
...n/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java
+10
-0
DepartmentApiService.java
...m/gic/haoban/manage/api/service/DepartmentApiService.java
+6
-0
DepartmentMapper.java
...ic/haoban/manage/service/dao/mapper/DepartmentMapper.java
+3
-0
DepartmentService.java
.../gic/haoban/manage/service/service/DepartmentService.java
+2
-0
DepartmentServiceImpl.java
...an/manage/service/service/impl/DepartmentServiceImpl.java
+5
-0
DepartmentApiServiceImpl.java
...ge/service/service/out/impl/DepartmentApiServiceImpl.java
+5
-0
DepartmentMapper.xml
...e3-service/src/main/resources/mapper/DepartmentMapper.xml
+11
-1
WxEnterpriseController.java
.../haoban/manage/web/controller/WxEnterpriseController.java
+1
-0
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java
View file @
07d1d007
...
@@ -76,6 +76,8 @@ public class WxEnterpriseDTO implements Serializable {
...
@@ -76,6 +76,8 @@ public class WxEnterpriseDTO implements Serializable {
private
Date
contactSecretLastTime
;
private
Date
contactSecretLastTime
;
private
Date
memberSecretLastTime
;
private
Date
memberSecretLastTime
;
private
Integer
storeTotal
;
private
Date
createTime
;
private
Date
createTime
;
...
@@ -389,6 +391,14 @@ public class WxEnterpriseDTO implements Serializable {
...
@@ -389,6 +391,14 @@ public class WxEnterpriseDTO implements Serializable {
this
.
contactSecretFlag
=
contactSecretFlag
;
this
.
contactSecretFlag
=
contactSecretFlag
;
}
}
public
Integer
getStoreTotal
()
{
return
storeTotal
;
}
public
void
setStoreTotal
(
Integer
storeTotal
)
{
this
.
storeTotal
=
storeTotal
;
}
...
...
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
View file @
07d1d007
...
@@ -164,5 +164,11 @@ public interface DepartmentApiService {
...
@@ -164,5 +164,11 @@ public interface DepartmentApiService {
boolean
isInitLocked
(
String
wxEnterpriseId
);
boolean
isInitLocked
(
String
wxEnterpriseId
);
void
syncWxDepartmentByParentMQ
(
String
res
);
void
syncWxDepartmentByParentMQ
(
String
res
);
/**
* 统计门店总数
* @param wxEnterpriseId
* @return
*/
Integer
totalStoreCountByEnterpriseId
(
String
wxEnterpriseId
);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java
View file @
07d1d007
...
@@ -64,4 +64,6 @@ public interface DepartmentMapper {
...
@@ -64,4 +64,6 @@ public interface DepartmentMapper {
List
<
TabHaobanDepartment
>
listByIds
(
@Param
(
"departmentIds"
)
List
<
String
>
departmentIds
);
List
<
TabHaobanDepartment
>
listByIds
(
@Param
(
"departmentIds"
)
List
<
String
>
departmentIds
);
TabHaobanDepartment
getTempFlagDepartment
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
TabHaobanDepartment
getTempFlagDepartment
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
Integer
totalStoreCountByEnterpriseId
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/DepartmentService.java
View file @
07d1d007
...
@@ -54,4 +54,6 @@ public interface DepartmentService {
...
@@ -54,4 +54,6 @@ public interface DepartmentService {
*/
*/
DepartmentDTO
getTempFlagDepartment
(
String
wxEnterpriseId
);
DepartmentDTO
getTempFlagDepartment
(
String
wxEnterpriseId
);
Integer
totalStoreCountByEnterpriseId
(
String
wxEnterpriseId
);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/DepartmentServiceImpl.java
View file @
07d1d007
...
@@ -190,4 +190,9 @@ public class DepartmentServiceImpl implements DepartmentService {
...
@@ -190,4 +190,9 @@ public class DepartmentServiceImpl implements DepartmentService {
public
DepartmentDTO
getTempFlagDepartment
(
String
wxEnterpriseId
)
{
public
DepartmentDTO
getTempFlagDepartment
(
String
wxEnterpriseId
)
{
return
EntityUtil
.
changeEntityByJSON
(
DepartmentDTO
.
class
,
mapper
.
getTempFlagDepartment
(
wxEnterpriseId
));
return
EntityUtil
.
changeEntityByJSON
(
DepartmentDTO
.
class
,
mapper
.
getTempFlagDepartment
(
wxEnterpriseId
));
}
}
@Override
public
Integer
totalStoreCountByEnterpriseId
(
String
wxEnterpriseId
)
{
return
mapper
.
totalStoreCountByEnterpriseId
(
wxEnterpriseId
);
}
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
View file @
07d1d007
...
@@ -753,4 +753,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
...
@@ -753,4 +753,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
}
}
}
}
@Override
public
Integer
totalStoreCountByEnterpriseId
(
String
wxEnterpriseId
)
{
return
departmentService
.
totalStoreCountByEnterpriseId
(
wxEnterpriseId
);
}
}
}
haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml
View file @
07d1d007
...
@@ -488,5 +488,14 @@
...
@@ -488,5 +488,14 @@
and status_flag = 1
and status_flag = 1
and temp_flag = 1
and temp_flag = 1
</select>
</select>
<select
id=
"totalStoreCountByEnterpriseId"
resultType=
"java.lang.Integer"
parameterType=
"java.lang.String"
>
select
count(1)
from tab_haoban_department
where wx_enterprise_id = #{wxEnterpriseId}
and status_flag = 1
and recycle_flag != 1
and store_flag = 1
</select>
</mapper>
</mapper>
\ No newline at end of file
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
View file @
07d1d007
...
@@ -102,6 +102,7 @@ public class WxEnterpriseController extends WebBaseController{
...
@@ -102,6 +102,7 @@ public class WxEnterpriseController extends WebBaseController{
WxEnterpriseDTO
wxEnterpriseDTO
=
wxEnterpriseApiService
.
getOne
(
wxEnterpriseId
);
WxEnterpriseDTO
wxEnterpriseDTO
=
wxEnterpriseApiService
.
getOne
(
wxEnterpriseId
);
wxEnterpriseDTO
.
setSmallVersion
(
"免费版"
);
wxEnterpriseDTO
.
setSmallVersion
(
"免费版"
);
wxEnterpriseDTO
.
setStoreTotal
(
departmentApiService
.
totalStoreCountByEnterpriseId
(
wxEnterpriseId
));
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
wxEnterpriseDTO
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
wxEnterpriseDTO
);
}
}
...
...
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