Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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
base_platform_enterprise
gic-platform-enterprise
Commits
767be7fb
Commit
767be7fb
authored
Aug 13, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数字会员配置
parent
76264cb9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
66 additions
and
2 deletions
+66
-2
DataWechatMemberConfigDTO.java
...om/gic/enterprise/dto/data/DataWechatMemberConfigDTO.java
+14
-0
DataConfigApiServiceImpl.java
...terprise/service/outer/impl/DataConfigApiServiceImpl.java
+15
-0
DataConfigController.java
...m/gic/enterprise/web/controller/DataConfigController.java
+36
-2
dubbo-gic-platform-enterprise-web.xml
.../src/main/resources/dubbo-gic-platform-enterprise-web.xml
+1
-0
No files found.
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataWechatMemberConfigDTO.java
View file @
767be7fb
...
...
@@ -58,6 +58,11 @@ public class DataWechatMemberConfigDTO implements Serializable{
*/
private
Date
updateTime
;
/**
* 1:刷新保存 2:配置保存
*/
private
Integer
validRefresh
;
public
Integer
getWechatMemberConfigId
()
{
return
wechatMemberConfigId
;
}
...
...
@@ -138,4 +143,13 @@ public class DataWechatMemberConfigDTO implements Serializable{
this
.
validSave
=
validSave
;
return
this
;
}
public
Integer
getValidRefresh
()
{
return
validRefresh
;
}
public
DataWechatMemberConfigDTO
setValidRefresh
(
Integer
validRefresh
)
{
this
.
validRefresh
=
validRefresh
;
return
this
;
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java
View file @
767be7fb
...
...
@@ -37,9 +37,24 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"会员卡域不能为空"
);
}
TabDataWechatMemberConfig
result
=
dataWechatMemberConfigService
.
getByMemberCardId
(
dto
.
getEnterpriseId
(),
memberCardId
);
//是否是刷新通道的保存
boolean
isRefresh
=
dto
.
getValidRefresh
()
==
1
;
if
(
isRefresh
)
{
dto
.
setValidSave
(
0
);
}
else
{
dto
.
setValidSave
(
1
);
}
if
(
result
==
null
)
{
dataWechatMemberConfigService
.
saveWechatMemberConfig
(
dto
);
}
else
{
if
(
isRefresh
)
{
if
(
result
.
getValidSave
()
==
1
)
{
//配置过了,不允许编辑
return
ServiceResponse
.
success
();
}
}
//配置过的
dto
.
setWechatMemberConfigId
(
result
.
getWechatMemberConfigId
());
dataWechatMemberConfigService
.
editWechatMemberConfig
(
dto
);
}
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DataConfigController.java
View file @
767be7fb
...
...
@@ -3,10 +3,14 @@ package com.gic.enterprise.web.controller;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.enterprise.dto.data.*
;
import
com.gic.enterprise.web.vo.data.*
;
import
com.gic.member.config.api.dto.DigitalConfigDTO
;
import
com.gic.member.config.api.service.AppletsConfigApiService
;
import
com.gic.member.config.api.service.EnterpriseConfigApiService
;
import
com.gic.member.config.api.service.ServiceConfigApiService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -34,6 +38,8 @@ public class DataConfigController {
private
AppletsConfigApiService
appletsConfigApiService
;
@Autowired
private
ServiceConfigApiService
serviceConfigApiService
;
@Autowired
private
EnterpriseConfigApiService
enterpriseConfigApiService
;
@RequestMapping
(
"list-all-applet"
)
...
...
@@ -50,14 +56,42 @@ public class DataConfigController {
@RequestMapping
(
"config-wechat-member"
)
public
RestResponse
configWechatMember
(
DataWechatMemberConfigDTO
dto
)
{
dto
.
setValidRefresh
(
2
);
return
ResultControllerUtils
.
commonResult
(
dataConfigApiService
.
configWechatMember
(
dto
));
}
@RequestMapping
(
"refresh-wechat-member-config"
)
public
RestResponse
refreshWechatMemberConfig
()
{
//todo
return
null
;
//
Integer
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
();
ServiceResponse
<
List
<
DigitalConfigDTO
>>
response
=
enterpriseConfigApiService
.
getDigitalConfigByEnterpriseId
(
enterpriseId
);
if
(
response
.
isSuccess
())
{
List
<
DigitalConfigDTO
>
list
=
response
.
getResult
();
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
list
.
forEach
(
e
->
{
dataConfigApiService
.
configWechatMember
(
new
DataWechatMemberConfigDTO
()
.
setEnterpriseId
(
enterpriseId
)
.
setMemberCardArea
(
e
.
getCardConfigId
().
toString
())
.
setRelateService
(
listToString
(
e
.
getServiceIds
()))
.
setRelateWechat
(
listToString
(
e
.
getAppletsIds
()))
.
setValidRefresh
(
1
));
});
}
}
return
RestResponse
.
success
();
}
private
static
String
listToString
(
List
<
Long
>
ids
)
{
StringBuilder
str
=
new
StringBuilder
();
if
(
CollectionUtils
.
isNotEmpty
(
ids
))
{
for
(
Long
temp
:
ids
)
{
str
.
append
(
temp
.
toString
()).
append
(
","
);
}
}
int
length
=
str
.
toString
().
length
();
return
str
.
substring
(
0
,
length
-
1
);
}
@RequestMapping
(
"list-wechat-member-config"
)
...
...
gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml
View file @
767be7fb
...
...
@@ -140,4 +140,5 @@
<dubbo:reference
interface=
"com.gic.member.config.api.service.OrderPointCalculationPartyApiService"
id=
"orderPointCalculationPartyApiService"
timeout=
"60000"
/>
<dubbo:reference
interface=
"com.gic.open.api.service.EnterpriseLicenseApiService"
id=
"enterpriseLicenseApiService"
timeout=
"6000"
retries=
"0"
/>
<dubbo:reference
interface=
"com.gic.member.config.api.service.EnterpriseConfigApiService"
id=
"enterpriseConfigApiService"
timeout=
"6000"
retries=
"0"
/>
</beans>
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