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
e8f6bc15
Commit
e8f6bc15
authored
Feb 10, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增商户添加商品资源勾选
parent
ee232041
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
3 deletions
+46
-3
EnterpriseDTO.java
...i/src/main/java/com/gic/enterprise/dto/EnterpriseDTO.java
+13
-0
TabEnterprise.java
...rc/main/java/com/gic/enterprise/entity/TabEnterprise.java
+14
-0
EnterpriseApiServiceImpl.java
...terprise/service/outer/impl/EnterpriseApiServiceImpl.java
+5
-0
TabEnterpriseMapper.xml
...service/src/main/resources/mapper/TabEnterpriseMapper.xml
+14
-3
No files found.
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/EnterpriseDTO.java
View file @
e8f6bc15
...
...
@@ -100,6 +100,11 @@ public class EnterpriseDTO implements Serializable{
*/
private
Integer
serviceStatus
;
/**
* 商品资源 1:有 0:无
*/
private
Integer
goodsResource
;
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
...
...
@@ -211,4 +216,12 @@ public class EnterpriseDTO implements Serializable{
public
void
setServiceStatus
(
Integer
serviceStatus
)
{
this
.
serviceStatus
=
serviceStatus
;
}
public
Integer
getGoodsResource
()
{
return
goodsResource
;
}
public
void
setGoodsResource
(
Integer
goodsResource
)
{
this
.
goodsResource
=
goodsResource
;
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabEnterprise.java
View file @
e8f6bc15
...
...
@@ -75,6 +75,11 @@ public class TabEnterprise {
*/
private
Integer
serviceStatus
;
/**
* 商品资源 1:有 0:无
*/
private
Integer
goodsResource
;
public
Integer
getEnterpriseId
()
{
return
enterpriseId
;
}
...
...
@@ -186,4 +191,12 @@ public class TabEnterprise {
public
void
setServiceStatus
(
Integer
serviceStatus
)
{
this
.
serviceStatus
=
serviceStatus
;
}
public
Integer
getGoodsResource
()
{
return
goodsResource
;
}
public
void
setGoodsResource
(
Integer
goodsResource
)
{
this
.
goodsResource
=
goodsResource
;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java
View file @
e8f6bc15
...
...
@@ -93,6 +93,11 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"公司名称不能重复"
);
}
if
(
enterpriseDTO
.
getGoodsResource
()
==
null
)
{
//默认没有商品资源
enterpriseDTO
.
setGoodsResource
(
0
);
}
//新增商户信息
int
enterpriseId
=
enterpriseService
.
saveEnterprise
(
enterpriseDTO
);
//商户初始化配置信息生成
...
...
gic-platform-enterprise-service/src/main/resources/mapper/TabEnterpriseMapper.xml
View file @
e8f6bc15
...
...
@@ -16,10 +16,11 @@
<result
column=
"version_code"
jdbcType=
"VARCHAR"
property=
"versionCode"
/>
<result
column=
"version_name"
jdbcType=
"VARCHAR"
property=
"versionName"
/>
<result
column=
"service_status"
jdbcType=
"INTEGER"
property=
"serviceStatus"
/>
<result
column=
"goods_resource"
jdbcType=
"INTEGER"
property=
"goodsResource"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
enterprise_id, enterprise_name, company_name, logo, area_id, address, status, create_time,
update_time, is_init_complete, audit_time, version_code, version_name, service_status
update_time, is_init_complete, audit_time, version_code, version_name, service_status
, goods_resource
</sql>
<select
id=
"selectByPrimaryKey"
parameterType=
"java.lang.Integer"
resultMap=
"BaseResultMap"
>
select
...
...
@@ -35,12 +36,12 @@
insert into tab_enterprise (enterprise_id, enterprise_name, company_name,
logo, area_id, address,
status, create_time, update_time,
is_init_complete, audit_time, version_code, version_name, service_status)
is_init_complete, audit_time, version_code, version_name, service_status
, goods_resource
)
values (#{enterpriseId,jdbcType=INTEGER}, #{enterpriseName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR},
#{logo,jdbcType=VARCHAR}, #{areaId,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{isInitComplete,jdbcType=INTEGER}, #{auditTime,jdbcType=TIMESTAMP}, #{versionCode,jdbcType=VARCHAR},
#{versionName,jdbcType=VARCHAR}, #{serviceStatus,jdbcType=INTEGER})
#{versionName,jdbcType=VARCHAR}, #{serviceStatus,jdbcType=INTEGER}
, #{goodsResource,jdbcType=INTEGER}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.gic.enterprise.entity.TabEnterprise"
useGeneratedKeys=
"true"
keyProperty=
"enterpriseId"
>
insert into tab_enterprise
...
...
@@ -87,6 +88,9 @@
<if
test=
"serviceStatus != null"
>
service_status,
</if>
<if
test=
"goodsResource != null"
>
goods_resource,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"enterpriseId != null"
>
...
...
@@ -131,6 +135,9 @@
<if
test=
"serviceStatus != null"
>
#{serviceStatus,jdbcType=INTEGER},
</if>
<if
test=
"goodsResource != null"
>
#{goodsResource,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update
id=
"updateByPrimaryKeySelective"
parameterType=
"com.gic.enterprise.entity.TabEnterprise"
>
...
...
@@ -175,6 +182,9 @@
<if
test=
"serviceStatus != null"
>
service_status = #{serviceStatus,jdbcType=INTEGER},
</if>
<if
test=
"goodsResource != null"
>
goods_resource = #{goodsResource,jdbcType=INTEGER},
</if>
</set>
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
</update>
...
...
@@ -193,6 +203,7 @@
version_code = #{versionCode,jdbcType=VARCHAR},
version_name = #{versionName,jdbcType=VARCHAR},
service_status = #{serviceStatus,jdbcType=INTEGER},
goods_resource = #{goodsResource,jdbcType=INTEGER}
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
</update>
...
...
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