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
91f0e261
Commit
91f0e261
authored
Apr 15, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
装修配置调整:如果没有店铺,不报错,继续走流程
parent
8299a3d1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
13 deletions
+12
-13
AppletDecorationConfigApiServiceImpl.java
...vice/outer/impl/AppletDecorationConfigApiServiceImpl.java
+12
-13
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletDecorationConfigApiServiceImpl.java
View file @
91f0e261
...
...
@@ -84,12 +84,6 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
if
(!
mainCardResult
.
isSuccess
())
{
return
ServiceResponse
.
failure
(
mainCardResult
.
getCode
(),
mainCardResult
.
getMessage
());
}
//默认选中和主卡关联的店铺,不可编辑
ServiceResponse
<
ShopDTO
>
shopResult
=
getMainCardStore
(
appId
,
enterpriseId
);
if
(!
shopResult
.
isSuccess
())
{
return
ServiceResponse
.
failure
(
shopResult
.
getCode
(),
shopResult
.
getMessage
());
}
ShopDTO
shopDTO
=
shopResult
.
getResult
();
Long
mainCardId
=
mainCardResult
.
getResult
();
AppletDecorationConfigDTO
result
=
new
AppletDecorationConfigDTO
();
...
...
@@ -98,8 +92,14 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
dataAssetArea
.
setOrder
(
mainCardId
.
toString
());
dataAssetArea
.
setCoupon
(
mainCardId
.
toString
());
dataAssetArea
.
setIntegral
(
mainCardId
.
toString
());
dataAssetArea
.
setMallOrder
(
shopDTO
.
getId
().
toString
());
dataAssetArea
.
setMallOrderName
(
shopDTO
.
getName
());
//默认选中和主卡关联的店铺,不可编辑
ServiceResponse
<
ShopDTO
>
shopResult
=
getMainCardStore
(
appId
,
enterpriseId
);
if
(
shopResult
.
isSuccess
())
{
ShopDTO
shopDTO
=
shopResult
.
getResult
();
dataAssetArea
.
setMallOrder
(
shopDTO
.
getId
().
toString
());
dataAssetArea
.
setMallOrderName
(
shopDTO
.
getName
());
}
//会员中心页面卡范围
result
.
setMemberCardArea
(
mainCardId
.
toString
());
//数据资产对象
...
...
@@ -311,12 +311,11 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
//默认选中和主卡关联的店铺,不可编辑 //实时调用
ServiceResponse
<
ShopDTO
>
shopResult
=
getMainCardStore
(
appId
,
enterpriseId
);
if
(!
shopResult
.
isSuccess
())
{
return
ServiceResponse
.
failure
(
shopResult
.
getCode
(),
shopResult
.
getMessage
());
if
(
shopResult
.
isSuccess
())
{
ShopDTO
shopDTO
=
shopResult
.
getResult
();
appletDataAssetArea
.
setMallOrder
(
shopDTO
.
getId
().
toString
());
appletDataAssetArea
.
setMallOrderName
(
shopDTO
.
getName
());
}
ShopDTO
shopDTO
=
shopResult
.
getResult
();
appletDataAssetArea
.
setMallOrder
(
shopDTO
.
getId
().
toString
());
appletDataAssetArea
.
setMallOrderName
(
shopDTO
.
getName
());
//数据资产设置
dto
.
setDataAssetArea
(
JSON
.
toJSONString
(
appletDataAssetArea
));
...
...
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