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
fc0051e0
Commit
fc0051e0
authored
Oct 30, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
积分商城订单数
parent
853fdf4e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
4 deletions
+26
-4
pom.xml
haoban-manage3-wx/pom.xml
+5
-0
WxStaffController.java
...m/gic/haoban/manage/web/controller/WxStaffController.java
+6
-3
MemberMarketingController.java
...e/web/controller/marketing/MemberMarketingController.java
+14
-0
dubbo-haoban-manage-wx.xml
...ge3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
+1
-1
No files found.
haoban-manage3-wx/pom.xml
View file @
fc0051e0
...
@@ -214,6 +214,11 @@
...
@@ -214,6 +214,11 @@
<artifactId>
gic-game-api
</artifactId>
<artifactId>
gic-game-api
</artifactId>
<version>
${gic-game-api}
</version>
<version>
${gic-game-api}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
com.gic
</groupId>
<artifactId>
gic-integral-mall-api
</artifactId>
<version>
${gic-integral-mall-api}
</version>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
View file @
fc0051e0
...
@@ -1616,9 +1616,12 @@ public class WxStaffController extends WebBaseController {
...
@@ -1616,9 +1616,12 @@ public class WxStaffController extends WebBaseController {
// 区经门店列表
// 区经门店列表
@RequestMapping
(
"/list-clerk-store"
)
@RequestMapping
(
"/list-clerk-store"
)
public
RestResponse
<
Object
>
listClerkStore
(
String
wxEnterpriseId
,
String
enterpriseId
,
String
clerkId
,
String
searchParams
,
@RequestParam
(
defaultValue
=
"20"
)
int
pageSize
,
@RequestParam
(
defaultValue
=
"1"
)
int
currentPage
)
{
public
RestResponse
<
Object
>
listClerkStore
(
String
wxEnterpriseId
,
String
enterpriseId
,
String
clerkId
,
@RequestParam
(
defaultValue
=
"20"
)
int
pageSize
,
@RequestParam
(
defaultValue
=
"1"
)
int
currentPage
)
{
List
<
StoreListVO
>
voList
=
new
ArrayList
<>();
List
<
String
>
storeIdList
=
this
.
staffApiService
.
getHaoBanStoreIdsRolesByClerkId
(
clerkId
,
wxEnterpriseId
)
;
List
<
String
>
storeIdList
=
this
.
staffApiService
.
getHaoBanStoreIdsRolesByClerkId
(
clerkId
,
wxEnterpriseId
)
;
if
(
CollectionUtils
.
isEmpty
(
storeIdList
))
{
return
RestResponse
.
failure
(
"-1"
,
"无授权门店"
);
}
List
<
StoreListVO
>
voList
=
new
ArrayList
<>();
int
totalCount
=
0
;
int
totalCount
=
0
;
List
<
StoreDTO
>
storeDTOList
=
null
;
List
<
StoreDTO
>
storeDTOList
=
null
;
if
(
storeIdList
.
get
(
0
).
contains
(
"-1"
))
{
if
(
storeIdList
.
get
(
0
).
contains
(
"-1"
))
{
...
@@ -1666,7 +1669,7 @@ public class WxStaffController extends WebBaseController {
...
@@ -1666,7 +1669,7 @@ public class WxStaffController extends WebBaseController {
//区经门店查询
//区经门店查询
@RequestMapping
(
"search-clerk-store"
)
@RequestMapping
(
"search-clerk-store"
)
public
RestResponse
<
Object
>
listClerkStoreByParams
(
String
wxEnterpriseId
,
String
enterpriseId
,
String
storeSearchParams
,
String
clerkId
)
{
public
RestResponse
<
Object
>
listClerkStoreByParams
(
String
wxEnterpriseId
,
String
enterpriseId
,
String
clerkId
,
String
storeSearchParams
)
{
if
(
StringUtils
.
isEmpty
(
storeSearchParams
))
{
if
(
StringUtils
.
isEmpty
(
storeSearchParams
))
{
return
RestResponse
.
failure
(
"-1"
,
"查询条件为空"
)
;
return
RestResponse
.
failure
(
"-1"
,
"查询条件为空"
)
;
}
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/marketing/MemberMarketingController.java
View file @
fc0051e0
...
@@ -37,6 +37,8 @@ import com.gic.game.api.dto.GameActivityDTO;
...
@@ -37,6 +37,8 @@ import com.gic.game.api.dto.GameActivityDTO;
import
com.gic.game.api.service.GameService
;
import
com.gic.game.api.service.GameService
;
import
com.gic.haoban.manage.web.controller.WebBaseController
;
import
com.gic.haoban.manage.web.controller.WebBaseController
;
import
com.gic.haoban.manage.web.vo.AiMemberLogListVO
;
import
com.gic.haoban.manage.web.vo.AiMemberLogListVO
;
import
com.gic.integralmall.api.dto.IntegralMallExchangeLogDTO
;
import
com.gic.integralmall.api.service.IntegralmallService
;
import
com.gic.marketing.api.dto.CoupCardShelfDTO
;
import
com.gic.marketing.api.dto.CoupCardShelfDTO
;
import
com.gic.marketing.api.dto.MemberCardLogDTO
;
import
com.gic.marketing.api.dto.MemberCardLogDTO
;
import
com.gic.marketing.api.dto.member.MemberSmsLogDTO
;
import
com.gic.marketing.api.dto.member.MemberSmsLogDTO
;
...
@@ -86,7 +88,19 @@ public class MemberMarketingController extends WebBaseController {
...
@@ -86,7 +88,19 @@ public class MemberMarketingController extends WebBaseController {
private
GameApiService
gameApiService
;
private
GameApiService
gameApiService
;
@Autowired
@Autowired
private
AchievementService
achievementService
;
private
AchievementService
achievementService
;
@Autowired
private
IntegralmallService
integralMallService
;
// 会员积分商城订单数
@RequestMapping
(
"/member/integral-order-num"
)
private
RestResponse
<
Object
>
getIntegralOrderNum
(
String
enterpriseId
,
String
memberId
)
{
Page
<
IntegralMallExchangeLogDTO
>
page
=
new
Page
<>();
page
.
setCurrentPage
(
1
);
page
.
setPageSize
(
20
);
page
=
integralMallService
.
findExchangeLogFromMember
(
enterpriseId
,
memberId
,
null
,
null
,
"1,2,3"
,
null
,
page
);
return
RestResponse
.
successResult
(
page
.
getTotalCount
());
}
/**
/**
* ECM营销日志
* ECM营销日志
*
*
...
...
haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
View file @
fc0051e0
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<dubbo:reference
interface=
"com.gic.marketing.pro.api.service.game.GameApiService"
id=
"gameApiService"
/>
<dubbo:reference
interface=
"com.gic.marketing.pro.api.service.game.GameApiService"
id=
"gameApiService"
/>
<dubbo:reference
interface=
"com.gic.member.api.service.AchievementService"
id=
"achievementService"
/>
<dubbo:reference
interface=
"com.gic.member.api.service.AchievementService"
id=
"achievementService"
/>
<dubbo:reference
interface=
"com.gic.clerk.api.service.PowerService"
id=
"powerService"
/>
<dubbo:reference
interface=
"com.gic.clerk.api.service.PowerService"
id=
"powerService"
/>
<dubbo:reference
interface=
"com.gic.integralmall.api.service.IntegralmallService"
id=
"integralmallService"
/>
<dubbo:reference
interface=
"com.gic.enterprise.api.service.EnterpriseUseForbidService"
id=
"enterpriseUseForbidService"
/>
<dubbo:reference
interface=
"com.gic.enterprise.api.service.EnterpriseUseForbidService"
id=
"enterpriseUseForbidService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService"
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService"
...
...
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