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
f662743a
Commit
f662743a
authored
Jul 20, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商户基础服务订购控制商品资源
parent
de1f9a33
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
4 deletions
+60
-4
EnterpriseListDTO.java
...c/main/java/com/gic/enterprise/dto/EnterpriseListDTO.java
+23
-4
LicenseUtils.java
.../src/main/java/com/gic/enterprise/utils/LicenseUtils.java
+14
-0
DataWechatMemberConfigService.java
...gic/enterprise/service/DataWechatMemberConfigService.java
+2
-0
DataWechatMemberConfigServiceImpl.java
...prise/service/impl/DataWechatMemberConfigServiceImpl.java
+7
-0
EnterpriseApiServiceImpl.java
...terprise/service/outer/impl/EnterpriseApiServiceImpl.java
+14
-0
No files found.
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/EnterpriseListDTO.java
View file @
f662743a
package
com
.
gic
.
enterprise
.
dto
;
import
com.gic.enterprise.constant.LicenseTypeEnum
;
import
com.gic.enterprise.utils.LicenseUtils
;
import
java.io.Serializable
;
import
java.util.Arrays
;
...
...
@@ -65,6 +66,11 @@ public class EnterpriseListDTO implements Serializable{
*/
private
Integer
isInitComplete
;
/**
* 商品license数量
*/
private
Integer
goodsCount
;
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
...
...
@@ -162,10 +168,14 @@ public class EnterpriseListDTO implements Serializable{
Map
<
String
,
Object
>
map
=
Arrays
.
stream
(
licenseUpperLimitStr
.
split
(
"-"
))
.
map
(
e
->
e
.
split
(
":"
))
.
collect
(
Collectors
.
toMap
(
e
->
e
[
0
],
e
->
e
[
1
]));
Object
memberCard
=
map
.
get
(
"会员卡"
);
Object
serviceCard
=
map
.
get
(
"服务号"
);
Object
weChat
=
map
.
get
(
"小程序"
);
Object
store
=
map
.
get
(
"门店"
);
Object
memberCard
=
map
.
get
(
LicenseUtils
.
MEMBER_CARD_LICENSE_NAME
);
Object
serviceCard
=
map
.
get
(
LicenseUtils
.
SERVICE_CARD_LICENSE_NAME
);
Object
weChat
=
map
.
get
(
LicenseUtils
.
WECHAT_LICENSE_NAME
);
Object
store
=
map
.
get
(
LicenseUtils
.
STORE_LICENSE_NAME
);
//商品license,用于前端license扩容的时候判断:商品数量不变,不提交商品license数据给接口
Object
goods
=
map
.
get
(
LicenseUtils
.
GOODS_LICENSE_NAME
);
setGoodsCount
(
goods
==
null
?
0
:
(
Integer
)
goods
);
return
(
memberCard
==
null
?
"0"
:
memberCard
.
toString
())
+
"-"
+
(
serviceCard
==
null
?
"0"
:
serviceCard
.
toString
())
+
"-"
+
(
weChat
==
null
?
"0"
:
weChat
.
toString
())
+
"-"
...
...
@@ -184,4 +194,13 @@ public class EnterpriseListDTO implements Serializable{
public
void
setIsInitComplete
(
Integer
isInitComplete
)
{
this
.
isInitComplete
=
isInitComplete
;
}
public
Integer
getGoodsCount
()
{
return
goodsCount
;
}
public
EnterpriseListDTO
setGoodsCount
(
Integer
goodsCount
)
{
this
.
goodsCount
=
goodsCount
;
return
this
;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/utils/LicenseUtils.java
0 → 100644
View file @
f662743a
package
com
.
gic
.
enterprise
.
utils
;
public
class
LicenseUtils
{
public
static
final
String
GOODS_LICENSE_NAME
=
"商品数量"
;
public
static
final
String
MEMBER_CARD_LICENSE_NAME
=
"会员卡"
;
public
static
final
String
SERVICE_CARD_LICENSE_NAME
=
"服务号"
;
public
static
final
String
WECHAT_LICENSE_NAME
=
"小程序"
;
public
static
final
String
STORE_LICENSE_NAME
=
"门店"
;
public
static
boolean
isGoodsLicense
(
String
licenseName
)
{
return
GOODS_LICENSE_NAME
.
equals
(
licenseName
);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataWechatMemberConfigService.java
View file @
f662743a
...
...
@@ -17,6 +17,8 @@ public interface DataWechatMemberConfigService {
*/
Integer
saveWechatMemberConfig
(
DataWechatMemberConfigDTO
dto
);
Integer
editWechatMemberConfig
(
DataWechatMemberConfigDTO
dto
);
/**
*
* @Title: getByMemberCardId
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataWechatMemberConfigServiceImpl.java
View file @
f662743a
...
...
@@ -28,6 +28,13 @@ public class DataWechatMemberConfigServiceImpl implements DataWechatMemberConfig
}
@Override
public
Integer
editWechatMemberConfig
(
DataWechatMemberConfigDTO
dto
)
{
TabDataWechatMemberConfig
record
=
EntityUtil
.
changeEntityNew
(
TabDataWechatMemberConfig
.
class
,
dto
);
record
.
setUpdateTime
(
new
Date
());
return
tabDataWechatMemberConfigMapper
.
updateByPrimaryKeySelective
(
record
);
}
@Override
public
TabDataWechatMemberConfig
getByMemberCardId
(
Integer
enterpriseId
,
String
memberCardId
)
{
return
tabDataWechatMemberConfigMapper
.
getByMemberCardId
(
enterpriseId
,
memberCardId
);
}
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java
View file @
f662743a
...
...
@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
import
java.util.*
;
import
com.gic.enterprise.constant.BillingAuditStatusEnum
;
import
com.gic.enterprise.utils.LicenseUtils
;
import
com.gic.marketing.process.api.service.sms.SmsSendApiService
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang.StringUtils
;
...
...
@@ -427,6 +428,13 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
public
ServiceResponse
<
MarketServiceDTO
>
buyForGicForNew
(
BuyForGicQO
basicParams
)
{
MarketServiceDTO
marketServiceDTO
=
new
MarketServiceDTO
();
List
<
TabEnterpriseResourceRel
>
businessFront
=
enterpriseResourceRelService
.
getByEnterpriseId
(
basicParams
.
getEnterpriseId
().
intValue
());
//是否有商品管理权限
boolean
hasGoodsAuth
=
false
;
if
(
CollectionUtils
.
isNotEmpty
(
businessFront
))
{
hasGoodsAuth
=
businessFront
.
stream
().
anyMatch
(
e
->
"goods"
.
equals
(
e
.
getResourceCode
())
&&
e
.
getResourceSwitch
().
intValue
()
==
1
);
}
List
<
com
.
gic
.
enterprise
.
dto
.
market
.
OrderBuyLicenseDTO
>
orderBuyLicenseDTOList
=
basicParams
.
getLicenseList
();
List
<
OrderBuyLicenseDTO
>
licenseListParams
=
EntityUtil
.
changeEntityListNew
(
OrderBuyLicenseDTO
.
class
,
orderBuyLicenseDTOList
);
...
...
@@ -478,6 +486,12 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
}
else
if
(
serviceType
==
2
)
{
//license
LicenseDTO
license
=
EntityUtil
.
changeEntityNew
(
LicenseDTO
.
class
,
orderItem
);
//没有商品权限
if
(!
hasGoodsAuth
)
{
if
(
LicenseUtils
.
GOODS_LICENSE_NAME
.
equals
(
orderItem
.
getServeName
()))
{
continue
;
}
}
license
.
setSkuId
(
long2String
(
orderItem
.
getSkuId
()));
license
.
setServeId
(
long2String
(
orderItem
.
getServeId
()));
licenseList
.
add
(
license
);
...
...
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