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
75772f04
Commit
75772f04
authored
May 11, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面装修调整:页面背景颜色字段改为字符串
parent
5d7f0822
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
18 deletions
+15
-18
AppletCustomPageDTO.java
...main/java/com/gic/enterprise/dto/AppletCustomPageDTO.java
+3
-3
TabAppletCustomPage.java
...n/java/com/gic/enterprise/entity/TabAppletCustomPage.java
+4
-4
AppletCustomPageApiServiceImpl.java
...se/service/outer/impl/AppletCustomPageApiServiceImpl.java
+2
-5
TabAppletCustomPageMapper.xml
...e/src/main/resources/mapper/TabAppletCustomPageMapper.xml
+6
-6
No files found.
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletCustomPageDTO.java
View file @
75772f04
...
...
@@ -36,7 +36,7 @@ public class AppletCustomPageDTO implements Serializable{
/**
* 背景颜色 1:灰色 2:白色 ,默认灰色(会员中心页面、积分服务页面、自定义页面、商城装首页 有该设置)
*/
private
Integer
backgroundColor
;
private
String
backgroundColor
;
/**
* 1:自定义 2:会员中心,3:客服页面
...
...
@@ -173,11 +173,11 @@ public class AppletCustomPageDTO implements Serializable{
this
.
componentStr
=
componentStr
;
}
public
Integer
getBackgroundColor
()
{
public
String
getBackgroundColor
()
{
return
backgroundColor
;
}
public
AppletCustomPageDTO
setBackgroundColor
(
Integer
backgroundColor
)
{
public
AppletCustomPageDTO
setBackgroundColor
(
String
backgroundColor
)
{
this
.
backgroundColor
=
backgroundColor
;
return
this
;
}
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletCustomPage.java
View file @
75772f04
...
...
@@ -27,9 +27,9 @@ public class TabAppletCustomPage {
private
Integer
entryCondition
;
/**
* 背景颜色
1:灰色 2:
白色 ,默认灰色(会员中心页面、积分服务页面、自定义页面、商城装首页 有该设置)
* 背景颜色
灰色
白色 ,默认灰色(会员中心页面、积分服务页面、自定义页面、商城装首页 有该设置)
*/
private
Integer
backgroundColor
;
private
String
backgroundColor
;
/**
* 1:自定义 2:会员卡 3:积分 4:特权 5:集团 6:会员中心,7:客服页面,8:积分服务页
...
...
@@ -154,11 +154,11 @@ public class TabAppletCustomPage {
this
.
setting
=
setting
;
}
public
Integer
getBackgroundColor
()
{
public
String
getBackgroundColor
()
{
return
backgroundColor
;
}
public
TabAppletCustomPage
setBackgroundColor
(
Integer
backgroundColor
)
{
public
TabAppletCustomPage
setBackgroundColor
(
String
backgroundColor
)
{
this
.
backgroundColor
=
backgroundColor
;
return
this
;
}
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletCustomPageApiServiceImpl.java
View file @
75772f04
...
...
@@ -91,13 +91,10 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"页面类型错误"
);
}
Integer
backgroundColor
=
jsonObject
.
getInteger
(
"backgroundColor"
);
String
backgroundColor
=
jsonObject
.
getString
(
"backgroundColor"
);
if
(
AppletPageTypeEnum
.
hasBackgroundColor
(
pageType
))
{
if
(
backgroundColor
==
null
)
{
backgroundColor
=
1
;
}
if
(
backgroundColor
.
intValue
()
!=
1
&&
backgroundColor
.
intValue
()
!=
2
)
{
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"页面背景值非法"
);
backgroundColor
=
"#A9A9A9"
;
}
}
else
{
//其他页面默认设置null
...
...
gic-platform-enterprise-service/src/main/resources/mapper/TabAppletCustomPageMapper.xml
View file @
75772f04
...
...
@@ -6,7 +6,7 @@
<result
column=
"enterprise_id"
jdbcType=
"INTEGER"
property=
"enterpriseId"
/>
<result
column=
"title"
jdbcType=
"VARCHAR"
property=
"title"
/>
<result
column=
"entry_condition"
jdbcType=
"INTEGER"
property=
"entryCondition"
/>
<result
column=
"background_color"
jdbcType=
"
INTEGE
R"
property=
"backgroundColor"
/>
<result
column=
"background_color"
jdbcType=
"
VARCHA
R"
property=
"backgroundColor"
/>
<result
column=
"page_type"
jdbcType=
"INTEGER"
property=
"pageType"
/>
<result
column=
"status"
jdbcType=
"INTEGER"
property=
"status"
/>
<result
column=
"app_type"
jdbcType=
"INTEGER"
property=
"appType"
/>
...
...
@@ -42,7 +42,7 @@
app_id, create_time, update_time,
setting)
values (#{pageId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR},
#{entryCondition,jdbcType=INTEGER}, #{backgroundColor,jdbcType=
INTEGE
R}, #{pageType,jdbcType=INTEGER},
#{entryCondition,jdbcType=INTEGER}, #{backgroundColor,jdbcType=
VARCHA
R}, #{pageType,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{appType,jdbcType=INTEGER},
#{appId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{setting,jdbcType=LONGVARCHAR})
...
...
@@ -101,7 +101,7 @@
#{entryCondition,jdbcType=INTEGER},
</if>
<if
test=
"backgroundColor != null"
>
#{backgroundColor,jdbcType=
INTEGE
R},
#{backgroundColor,jdbcType=
VARCHA
R},
</if>
<if
test=
"pageType != null"
>
#{pageType,jdbcType=INTEGER},
...
...
@@ -139,7 +139,7 @@
entry_condition = #{entryCondition,jdbcType=INTEGER},
</if>
<if
test=
"backgroundColor != null"
>
background_color = #{backgroundColor,jdbcType=
INTEGE
R},
background_color = #{backgroundColor,jdbcType=
VARCHA
R},
</if>
<if
test=
"pageType != null"
>
page_type = #{pageType,jdbcType=INTEGER},
...
...
@@ -170,7 +170,7 @@
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
title = #{title,jdbcType=VARCHAR},
entry_condition = #{entryCondition,jdbcType=INTEGER},
background_color = #{backgroundColor,jdbcType=
INTEGE
R},
background_color = #{backgroundColor,jdbcType=
VARCHA
R},
page_type = #{pageType,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
app_type = #{appType,jdbcType=INTEGER},
...
...
@@ -185,7 +185,7 @@
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
title = #{title,jdbcType=VARCHAR},
entry_condition = #{entryCondition,jdbcType=INTEGER},
background_color = #{backgroundColor,jdbcType=
INTEGE
R},
background_color = #{backgroundColor,jdbcType=
VARCHA
R},
page_type = #{pageType,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
app_type = #{appType,jdbcType=INTEGER},
...
...
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