Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
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
haoban3.0
haoban-manage3.0
Commits
fe9c164e
Commit
fe9c164e
authored
Aug 26, 2021
by
xugaojun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
操作设置需求:优化代码,修改注释名称,生成mapper实体等,添加操作设置相关接口。
parent
6f71415f
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
770 additions
and
0 deletions
+770
-0
OperationSettingDTO.java
...va/com/gic/haoban/manage/api/dto/OperationSettingDTO.java
+111
-0
OperationSettingApiService.java
...haoban/manage/api/service/OperationSettingApiService.java
+28
-0
TabHaobanOperationSettingMapper.java
...e/service/dao/mapper/TabHaobanOperationSettingMapper.java
+77
-0
TabHaobanOperationSetting.java
...oban/manage/service/entity/TabHaobanOperationSetting.java
+98
-0
OperationSettingApiServiceImpl.java
...vice/service/out/impl/OperationSettingApiServiceImpl.java
+65
-0
dubbo-haoban-manage-service.xml
...ervice/src/main/resources/dubbo-haoban-manage-service.xml
+3
-0
TabHaobanOperationSettingMapper.xml
...main/resources/mapper/TabHaobanOperationSettingMapper.xml
+150
-0
TestOperDatabase.java
haoban-manage3-service/src/test/java/TestOperDatabase.java
+35
-0
SettingController.java
...m/gic/haoban/manage/web/controller/SettingController.java
+51
-0
dubbo-haoban-manage-web.xml
...3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
+3
-0
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+23
-0
OperationSettingVO.java
...java/com/gic/haoban/manage/web/vo/OperationSettingVO.java
+123
-0
dubbo-haoban-manage-wx.xml
...ge3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
+3
-0
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/OperationSettingDTO.java
0 → 100644
View file @
fe9c164e
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
*
* @author YongEn
* @date 2021-08-26 10:38:04
*/
public
class
OperationSettingDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
6986750061550226819L
;
/**
* 操作设置id
*/
private
String
settingId
;
/**
* 企业微信id
*/
private
String
wxEnterpriseId
;
/**
* 导购手机号是否必填 1 是 0 否
*/
private
Integer
clerkPhoneFlag
;
/**
* 店长是否可编辑门店 1 是 0 否
*/
private
Integer
storeEditFlag
;
/**
* 创建时间
*/
private
Date
createTime
;
/**
* 更新时间
*/
private
Date
updateTime
;
/**
* 数据状态 1 正常 0 已删除
*/
private
Integer
statusFlag
;
public
String
getSettingId
()
{
return
settingId
;
}
public
void
setSettingId
(
String
settingId
)
{
this
.
settingId
=
settingId
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
Integer
getClerkPhoneFlag
()
{
return
clerkPhoneFlag
;
}
public
void
setClerkPhoneFlag
(
Integer
clerkPhoneFlag
)
{
this
.
clerkPhoneFlag
=
clerkPhoneFlag
;
}
public
Integer
getStoreEditFlag
()
{
return
storeEditFlag
;
}
public
void
setStoreEditFlag
(
Integer
storeEditFlag
)
{
this
.
storeEditFlag
=
storeEditFlag
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
@Override
public
String
toString
()
{
return
"OperationSettingDTO{"
+
"settingId='"
+
settingId
+
'\''
+
", wxEnterpriseId='"
+
wxEnterpriseId
+
'\''
+
", clerkPhoneFlag="
+
clerkPhoneFlag
+
", storeEditFlag="
+
storeEditFlag
+
", createTime="
+
createTime
+
", updateTime="
+
updateTime
+
", statusFlag="
+
statusFlag
+
'}'
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/OperationSettingApiService.java
0 → 100644
View file @
fe9c164e
package
com
.
gic
.
haoban
.
manage
.
api
.
service
;
import
com.gic.haoban.manage.api.dto.OperationSettingDTO
;
/**
* desc:操作设置对外服务
*
* @author: YongEn
* @date: 2021/8/26
**/
public
interface
OperationSettingApiService
{
/**
* 保存设置
*
* @param dto dto
*/
void
saveOrUpdate
(
OperationSettingDTO
dto
);
/**
* 根据企业微信id查询
*
* @param wxEnterpriseId
* @return
*/
OperationSettingDTO
getByWxEnterpriseId
(
String
wxEnterpriseId
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanOperationSettingMapper.java
0 → 100644
View file @
fe9c164e
package
com
.
gic
.
haoban
.
manage
.
service
.
dao
.
mapper
;
import
com.gic.haoban.manage.service.entity.TabHaobanOperationSetting
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
/**
* 操作设置表(TabHaobanOperationSetting)表数据库访问层
*
* @author YongEn
* @date 2021-08-26 10:39:45
*/
@Repository
public
interface
TabHaobanOperationSettingMapper
{
/**
* 新增数据
*
* @param setting 实例对象
* @return 影响行数
*/
int
insert
(
TabHaobanOperationSetting
setting
);
/**
* 修改数据
*
* @param setting 实例对象
* @return 影响行数
*/
int
update
(
TabHaobanOperationSetting
setting
);
/**
* 通过主键删除数据
*
* @param settingId 主键
* @return 影响行数
*/
int
deleteById
(
String
settingId
);
/**
* 通过ID查询单条数据
*
* @param settingId 主键
* @return 实例对象
*/
TabHaobanOperationSetting
queryById
(
String
settingId
);
/**
* 通过实体作为筛选条件查询
*
* @param setting 实例对象
* @return 对象列表
*/
List
<
TabHaobanOperationSetting
>
queryAll
(
TabHaobanOperationSetting
setting
);
/**
* 分页总数
*
* @return 对象列表
*/
int
queryCountByPage
();
/**
* 分页列表
*
* @param offset 查询起始位置
* @param limit 查询条数
* @return 对象列表
*/
List
<
TabHaobanOperationSetting
>
queryListByPage
(
@Param
(
"offset"
)
int
offset
,
@Param
(
"limit"
)
int
limit
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanOperationSetting.java
0 → 100644
View file @
fe9c164e
package
com
.
gic
.
haoban
.
manage
.
service
.
entity
;
/**
* 操作设置表(TabHaobanOperationSetting)实体类
*
* @author YongEn
* @date 2021-08-26 10:38:04
*/
import
java.util.Date
;
public
class
TabHaobanOperationSetting
{
/**
* 操作设置id
*/
private
String
settingId
;
/**
* 企业微信id
*/
private
String
wxEnterpriseId
;
/**
* 导购手机号是否必填 1 是 0 否
*/
private
Integer
clerkPhoneFlag
;
/**
* 店长是否可编辑门店 1 是 0 否
*/
private
Integer
storeEditFlag
;
/**
* 创建时间
*/
private
Date
createTime
;
/**
* 更新时间
*/
private
Date
updateTime
;
/**
* 数据状态 1 正常 0 已删除
*/
private
Integer
statusFlag
;
public
String
getSettingId
()
{
return
settingId
;
}
public
void
setSettingId
(
String
settingId
)
{
this
.
settingId
=
settingId
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
Integer
getClerkPhoneFlag
()
{
return
clerkPhoneFlag
;
}
public
void
setClerkPhoneFlag
(
Integer
clerkPhoneFlag
)
{
this
.
clerkPhoneFlag
=
clerkPhoneFlag
;
}
public
Integer
getStoreEditFlag
()
{
return
storeEditFlag
;
}
public
void
setStoreEditFlag
(
Integer
storeEditFlag
)
{
this
.
storeEditFlag
=
storeEditFlag
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/OperationSettingApiServiceImpl.java
0 → 100644
View file @
fe9c164e
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
out
.
impl
;
import
com.gic.haoban.common.utils.EntityUtil
;
import
com.gic.haoban.common.utils.UuidUtil
;
import
com.gic.haoban.manage.api.dto.OperationSettingDTO
;
import
com.gic.haoban.manage.api.service.OperationSettingApiService
;
import
com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper
;
import
com.gic.haoban.manage.service.entity.TabHaobanOperationSetting
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.StringUtils
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Objects
;
/**
* desc:操作设置对外服务实现
*
* @author: YongEn
* @date: 2021/8/26
**/
@Service
public
class
OperationSettingApiServiceImpl
implements
OperationSettingApiService
{
@Autowired
private
TabHaobanOperationSettingMapper
operationSettingMapper
;
@Override
public
void
saveOrUpdate
(
OperationSettingDTO
dto
)
{
// 查询
OperationSettingDTO
settingDTO
=
this
.
getByWxEnterpriseId
(
dto
.
getWxEnterpriseId
());
TabHaobanOperationSetting
setting
=
new
TabHaobanOperationSetting
();
setting
.
setClerkPhoneFlag
(
Objects
.
isNull
(
dto
.
getClerkPhoneFlag
())
?
0
:
dto
.
getClerkPhoneFlag
());
setting
.
setStoreEditFlag
(
Objects
.
isNull
(
dto
.
getStoreEditFlag
())
?
0
:
dto
.
getStoreEditFlag
());
if
(
Objects
.
isNull
(
settingDTO
))
{
// save
setting
.
setCreateTime
(
new
Date
());
setting
.
setStatusFlag
(
1
);
setting
.
setSettingId
(
UuidUtil
.
randomUUID
());
setting
.
setWxEnterpriseId
(
dto
.
getWxEnterpriseId
());
operationSettingMapper
.
insert
(
setting
);
return
;
}
// update
setting
.
setSettingId
(
settingDTO
.
getSettingId
());
setting
.
setUpdateTime
(
new
Date
());
operationSettingMapper
.
update
(
setting
);
}
@Override
public
OperationSettingDTO
getByWxEnterpriseId
(
String
wxEnterpriseId
)
{
if
(
StringUtils
.
isEmpty
(
wxEnterpriseId
))
{
return
null
;
}
TabHaobanOperationSetting
setting
=
new
TabHaobanOperationSetting
();
// 暂无合适枚举 1 代表正常数据
setting
.
setStatusFlag
(
1
);
setting
.
setWxEnterpriseId
(
wxEnterpriseId
);
List
<
TabHaobanOperationSetting
>
settingList
=
operationSettingMapper
.
queryAll
(
setting
);
return
CollectionUtils
.
isEmpty
(
settingList
)
?
null
:
EntityUtil
.
changeEntityByJSON
(
OperationSettingDTO
.
class
,
settingList
.
get
(
0
));
}
}
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
View file @
fe9c164e
...
@@ -56,6 +56,9 @@
...
@@ -56,6 +56,9 @@
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.QywxTagApiService"
ref=
"qywxTagApiServiceImpl"
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.QywxTagApiService"
ref=
"qywxTagApiServiceImpl"
timeout=
"10000"
/>
timeout=
"10000"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.OperationSettingApiService"
ref=
"operationSettingApiServiceImpl"
timeout=
"10000"
/>
<dubbo:reference
interface=
"com.gic.enterprise.api.service.DepartmentService"
id=
"gicDepartmentService"
/>
<dubbo:reference
interface=
"com.gic.enterprise.api.service.DepartmentService"
id=
"gicDepartmentService"
/>
<dubbo:reference
interface=
"com.gic.wechat.api.service.qywx.QywxDepartmentApiService"
id=
"qywxDepartmentApiService"
/>
<dubbo:reference
interface=
"com.gic.wechat.api.service.qywx.QywxDepartmentApiService"
id=
"qywxDepartmentApiService"
/>
<dubbo:reference
interface=
"com.gic.wechat.api.service.qywx.QywxSuiteApiService"
id=
"qywxSuiteApiService"
/>
<dubbo:reference
interface=
"com.gic.wechat.api.service.qywx.QywxSuiteApiService"
id=
"qywxSuiteApiService"
/>
...
...
haoban-manage3-service/src/main/resources/mapper/TabHaobanOperationSettingMapper.xml
0 → 100644
View file @
fe9c164e
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper"
>
<resultMap
type=
"com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"
id=
"TabHaobanOperationSettingMap"
>
<result
property=
"settingId"
column=
"setting_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"wxEnterpriseId"
column=
"wx_enterprise_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"clerkPhoneFlag"
column=
"clerk_phone_flag"
jdbcType=
"INTEGER"
/>
<result
property=
"storeEditFlag"
column=
"store_edit_flag"
jdbcType=
"INTEGER"
/>
<result
property=
"createTime"
column=
"create_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"updateTime"
column=
"update_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"statusFlag"
column=
"status_flag"
jdbcType=
"INTEGER"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
setting_id, wx_enterprise_id, clerk_phone_flag, store_edit_flag, create_time, update_time, status_flag
</sql>
<!--新增所有列-->
<insert
id=
"insert"
keyProperty=
"settingId"
useGeneratedKeys=
"true"
parameterType=
"com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"
>
INSERT INTO tab_haoban_operation_setting
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"settingId != null and settingId != ''"
>
setting_id,
</if>
<if
test=
"wxEnterpriseId != null and wxEnterpriseId != ''"
>
wx_enterprise_id,
</if>
<if
test=
"clerkPhoneFlag != null"
>
clerk_phone_flag,
</if>
<if
test=
"storeEditFlag != null"
>
store_edit_flag,
</if>
<if
test=
"createTime != null"
>
create_time,
</if>
<if
test=
"updateTime != null"
>
update_time,
</if>
<if
test=
"statusFlag != null"
>
status_flag,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"settingId != null and settingId != ''"
>
#{settingId},
</if>
<if
test=
"wxEnterpriseId != null and wxEnterpriseId != ''"
>
#{wxEnterpriseId},
</if>
<if
test=
"clerkPhoneFlag != null"
>
#{clerkPhoneFlag},
</if>
<if
test=
"storeEditFlag != null"
>
#{storeEditFlag},
</if>
<if
test=
"createTime != null"
>
#{createTime},
</if>
<if
test=
"updateTime != null"
>
#{updateTime},
</if>
<if
test=
"statusFlag != null"
>
#{statusFlag},
</if>
</trim>
</insert>
<!--通过主键修改数据-->
<update
id=
"update"
parameterType=
"com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"
>
update tab_haoban_operation_setting
<set>
<if
test=
"wxEnterpriseId != null and wxEnterpriseId != ''"
>
wx_enterprise_id = #{wxEnterpriseId},
</if>
<if
test=
"clerkPhoneFlag != null"
>
clerk_phone_flag = #{clerkPhoneFlag},
</if>
<if
test=
"storeEditFlag != null"
>
store_edit_flag = #{storeEditFlag},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
<if
test=
"updateTime != null"
>
update_time = #{updateTime},
</if>
<if
test=
"statusFlag != null"
>
status_flag = #{statusFlag},
</if>
</set>
where setting_id = #{settingId}
</update>
<!--通过主键删除-->
<delete
id=
"deleteById"
>
delete from tab_haoban_operation_setting where setting_id = #{settingId}
</delete>
<!--查询单个-->
<select
id=
"queryById"
resultMap=
"TabHaobanOperationSettingMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_operation_setting
where setting_id = #{settingId}
</select>
<!--通过实体作为筛选条件查询-->
<select
id=
"queryAll"
parameterType=
"com.gic.haoban.manage.service.entity.TabHaobanOperationSetting"
resultMap=
"TabHaobanOperationSettingMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_operation_setting
<where>
<if
test=
"settingId != null and settingId != ''"
>
and setting_id = #{settingId}
</if>
<if
test=
"wxEnterpriseId != null and wxEnterpriseId != ''"
>
and wx_enterprise_id = #{wxEnterpriseId}
</if>
<if
test=
"clerkPhoneFlag != null"
>
and clerk_phone_flag = #{clerkPhoneFlag}
</if>
<if
test=
"storeEditFlag != null"
>
and store_edit_flag = #{storeEditFlag}
</if>
<if
test=
"createTime != null"
>
and create_time = #{createTime}
</if>
<if
test=
"updateTime != null"
>
and update_time = #{updateTime}
</if>
<if
test=
"statusFlag != null"
>
and status_flag = #{statusFlag}
</if>
</where>
</select>
<select
id=
"queryCountByPage"
resultType=
"int"
>
select
count(*)
from tab_haoban_operation_setting
</select>
<select
id=
"queryListByPage"
resultMap=
"TabHaobanOperationSettingMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_operation_setting
limit #{offset}, #{limit}
</select>
</mapper>
haoban-manage3-service/src/test/java/TestOperDatabase.java
0 → 100644
View file @
fe9c164e
import
com.gic.haoban.common.utils.UuidUtil
;
import
com.gic.haoban.manage.service.dao.mapper.TabHaobanOperationSettingMapper
;
import
com.gic.haoban.manage.service.entity.TabHaobanOperationSetting
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
java.util.Date
;
/**
* desc:
*
* @author: YongEn
* @date: 2021/8/26
**/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@ContextConfiguration
(
locations
=
{
"classpath:applicationContext-conf.xml"
})
public
class
TestOperDatabase
{
@Autowired
private
TabHaobanOperationSettingMapper
tabHaobanOperationSettingMapper
;
@Test
public
void
testOperSetting
()
{
TabHaobanOperationSetting
setting
=
new
TabHaobanOperationSetting
();
setting
.
setClerkPhoneFlag
(
1
);
setting
.
setCreateTime
(
new
Date
());
setting
.
setSettingId
(
UuidUtil
.
randomUUID
());
setting
.
setWxEnterpriseId
(
"123123"
);
tabHaobanOperationSettingMapper
.
insert
(
setting
);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SettingController.java
0 → 100644
View file @
fe9c164e
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.manage.api.dto.OperationSettingDTO
;
import
com.gic.haoban.manage.api.service.OperationSettingApiService
;
import
com.gic.haoban.manage.web.anno.HttpLimit
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.Objects
;
/**
* desc:设置controller
*
* @author: YongEn
* @date: 2021/8/26
**/
@RestController
@RequestMapping
(
"/setting"
)
public
class
SettingController
extends
WebBaseController
{
@Autowired
private
OperationSettingApiService
operationSettingApiService
;
@HttpLimit
@RequestMapping
(
value
=
"/operation-setting/save-or-update"
,
method
=
RequestMethod
.
POST
)
private
HaobanResponse
operationSettingSaveOrUpdate
(
@RequestBody
OperationSettingDTO
dto
)
{
// 保存或更新操作设置,限流
if
(
Objects
.
isNull
(
dto
)
||
Objects
.
isNull
(
dto
.
getWxEnterpriseId
()))
{
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
operationSettingApiService
.
saveOrUpdate
(
dto
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
@RequestMapping
(
value
=
"/get-operation-setting"
,
method
=
RequestMethod
.
GET
)
private
HaobanResponse
getOperationSetting
(
String
wxEnterpriseId
)
{
// 查询操作配置
OperationSettingDTO
dto
=
operationSettingApiService
.
getByWxEnterpriseId
(
wxEnterpriseId
);
if
(
Objects
.
isNull
(
dto
))
{
return
resultResponse
(
HaoBanErrCode
.
ERR_8
);
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
dto
);
}
}
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
View file @
fe9c164e
...
@@ -75,5 +75,8 @@
...
@@ -75,5 +75,8 @@
<dubbo:reference
id=
"maidianLogApiService"
interface=
"com.gic.haoban.manage.api.service.MaidianLogApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"maidianLogApiService"
interface=
"com.gic.haoban.manage.api.service.MaidianLogApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"authorizeService"
interface=
"com.gic.enterprise.api.service.AuthorizeService"
timeout=
"10000"
<dubbo:reference
id=
"authorizeService"
interface=
"com.gic.enterprise.api.service.AuthorizeService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
retries=
"0"
check=
"false"
/>
<dubbo:reference
id=
"operationSettingApiServiceImpl"
interface=
"com.gic.haoban.manage.api.service.OperationSettingApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
</beans>
</beans>
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
fe9c164e
...
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
...
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
...
@@ -80,6 +81,10 @@ public class ClerkController extends WebBaseController{
...
@@ -80,6 +81,10 @@ public class ClerkController extends WebBaseController{
@Autowired
@Autowired
private
ExternalClerkRelatedApiService
externalClerkRelatedApiService
;
private
ExternalClerkRelatedApiService
externalClerkRelatedApiService
;
@Autowired
private
OperationSettingApiService
operationSettingApiService
;
//选择成员列表
//选择成员列表
@RequestMapping
(
"/staff-list"
)
@RequestMapping
(
"/staff-list"
)
public
HaobanResponse
staffList
(
String
storeId
)
{
public
HaobanResponse
staffList
(
String
storeId
)
{
...
@@ -214,6 +219,24 @@ public class ClerkController extends WebBaseController{
...
@@ -214,6 +219,24 @@ public class ClerkController extends WebBaseController{
auditSettingVO
.
setFreshFriendFlag
(
mainStore
.
getFreshFriendFlag
());
auditSettingVO
.
setFreshFriendFlag
(
mainStore
.
getFreshFriendFlag
());
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
auditSettingVO
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
auditSettingVO
);
}
}
@RequestMapping
(
"/get-operation-setting"
)
public
HaobanResponse
getOperatorSetting
(
String
wxEnterpriseId
,
String
enterpriseId
)
{
// 查询操作配置
OperationSettingDTO
dto
=
operationSettingApiService
.
getByWxEnterpriseId
(
wxEnterpriseId
);
if
(
Objects
.
isNull
(
dto
))
{
return
resultResponse
(
HaoBanErrCode
.
ERR_8
);
}
OperationSettingVO
vo
=
EntityUtil
.
changeEntity
(
OperationSettingVO
.
class
,
dto
);
// 是否开启导购编辑,如果不开启,默认无效
WxEnterpriseRelationDetailDTO
info
=
wxEnterpriseRelatedApiService
.
getEnterpriseBindInfo
(
wxEnterpriseId
,
enterpriseId
);
if
(
Objects
.
nonNull
(
info
)
&&
info
.
getClerkEditFlag
()
==
1
)
{
vo
.
setEffectFlag
(
1
);
}
else
{
vo
.
setEffectFlag
(
0
);
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
vo
);
}
//新增店员
//新增店员
@HttpLimit
@HttpLimit
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/OperationSettingVO.java
0 → 100644
View file @
fe9c164e
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
*
* @author YongEn
* @date 2021-08-26 10:38:04
*/
public
class
OperationSettingVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
382528365529162044L
;
/**
* 是否生效
*/
private
Integer
effectFlag
;
/**
* 操作设置id
*/
private
String
settingId
;
/**
* 企业微信id
*/
private
String
wxEnterpriseId
;
/**
* 导购手机号是否必填 1 是 0 否
*/
private
Integer
clerkPhoneFlag
;
/**
* 店长是否可编辑门店 1 是 0 否
*/
private
Integer
storeEditFlag
;
/**
* 创建时间
*/
private
Date
createTime
;
/**
* 更新时间
*/
private
Date
updateTime
;
/**
* 数据状态 1 正常 0 已删除
*/
private
Integer
statusFlag
;
public
Integer
getEffectFlag
()
{
return
effectFlag
;
}
public
void
setEffectFlag
(
Integer
effectFlag
)
{
this
.
effectFlag
=
effectFlag
;
}
public
String
getSettingId
()
{
return
settingId
;
}
public
void
setSettingId
(
String
settingId
)
{
this
.
settingId
=
settingId
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
Integer
getClerkPhoneFlag
()
{
return
clerkPhoneFlag
;
}
public
void
setClerkPhoneFlag
(
Integer
clerkPhoneFlag
)
{
this
.
clerkPhoneFlag
=
clerkPhoneFlag
;
}
public
Integer
getStoreEditFlag
()
{
return
storeEditFlag
;
}
public
void
setStoreEditFlag
(
Integer
storeEditFlag
)
{
this
.
storeEditFlag
=
storeEditFlag
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
@Override
public
String
toString
()
{
return
"OperationSettingDTO{"
+
"settingId='"
+
settingId
+
'\''
+
", wxEnterpriseId='"
+
wxEnterpriseId
+
'\''
+
", clerkPhoneFlag="
+
clerkPhoneFlag
+
", storeEditFlag="
+
storeEditFlag
+
", createTime="
+
createTime
+
", updateTime="
+
updateTime
+
", statusFlag="
+
statusFlag
+
'}'
;
}
}
haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
View file @
fe9c164e
...
@@ -71,4 +71,7 @@
...
@@ -71,4 +71,7 @@
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService"
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService"
id=
"externalClerkRelatedApiService"
/>
id=
"externalClerkRelatedApiService"
/>
<dubbo:reference
id=
"operationSettingApiServiceImpl"
interface=
"com.gic.haoban.manage.api.service.OperationSettingApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
</beans>
</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