Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
徐少华
midjourney-proxy
Commits
20e96818
Commit
20e96818
authored
Dec 22, 2021
by
朱亚洁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:[1006286]选企微码增加文案设置
parent
1a56988a
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
5 deletions
+33
-5
BookQrcodeWxworkBizImpl.java
...om/pcloud/book/book/biz/impl/BookQrcodeWxworkBizImpl.java
+17
-2
BookQrcodeWxwork.java
...in/java/com/pcloud/book/book/entity/BookQrcodeWxwork.java
+6
-0
BookQrcodeWxworkRequestVO.java
...cloud/book/book/vo/request/BookQrcodeWxworkRequestVO.java
+4
-0
BookQrcodeWxworkResponseVO.java
...oud/book/book/vo/response/BookQrcodeWxworkResponseVO.java
+2
-0
BookQrcodeWxworkDao.xml
...ok/src/main/resources/mapper/book/BookQrcodeWxworkDao.xml
+4
-3
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookQrcodeWxworkBizImpl.java
View file @
20e96818
...
@@ -86,6 +86,7 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
...
@@ -86,6 +86,7 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
}
}
bookQrcodeWxwork
.
setWxworkQrcodeId
(
bookQrcodeWxworkRequestVO
.
getWxworkQrcodeId
());
bookQrcodeWxwork
.
setWxworkQrcodeId
(
bookQrcodeWxworkRequestVO
.
getWxworkQrcodeId
());
bookQrcodeWxwork
.
setWxworkQrcodeType
(
bookQrcodeWxworkRequestVO
.
getWxworkQrcodeType
());
bookQrcodeWxwork
.
setWxworkQrcodeType
(
bookQrcodeWxworkRequestVO
.
getWxworkQrcodeType
());
bookQrcodeWxwork
.
setGuide
(
bookQrcodeWxworkRequestVO
.
getGuide
());
bookQrcodeWxworkDao
.
insert
(
bookQrcodeWxwork
);
bookQrcodeWxworkDao
.
insert
(
bookQrcodeWxwork
);
}
}
}
}
...
@@ -136,11 +137,18 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
...
@@ -136,11 +137,18 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
@Override
@Override
public
BookQrcodeWxworkResponseVO
getWxworkQrcodeInfoBySceneOrBookGroup
(
Long
sceneId
,
Long
bookGroupId
,
Integer
wxworkQrcodeType
)
{
public
BookQrcodeWxworkResponseVO
getWxworkQrcodeInfoBySceneOrBookGroup
(
Long
sceneId
,
Long
bookGroupId
,
Integer
wxworkQrcodeType
)
{
BookQrcodeWxworkResponseVO
bookQrcodeWxworkResponseVO
=
new
BookQrcodeWxworkResponseVO
();
BookQrcodeWxworkResponseVO
bookQrcodeWxworkResponseVO
=
new
BookQrcodeWxworkResponseVO
();
Long
wxworkQrcodeId
=
this
.
getWxworkQrcodeIdBySceneOrBookGroup
(
sceneId
,
bookGroupId
,
wxworkQrcodeType
);
BookQrcodeWxwork
bookQrcodeWxwork
;
if
(
null
==
wxworkQrcodeId
)
{
if
(
null
!=
sceneId
)
{
bookQrcodeWxwork
=
bookQrcodeWxworkDao
.
getByQrcodeIdAndType
(
sceneId
,
BookQrcodeType
.
OFFICIAL_ACCOUNTS
.
getCode
(),
wxworkQrcodeType
);
}
else
{
bookQrcodeWxwork
=
bookQrcodeWxworkDao
.
getByQrcodeIdAndType
(
bookGroupId
,
BookQrcodeType
.
RAYS
.
getCode
(),
wxworkQrcodeType
);
}
if
(
null
==
bookQrcodeWxwork
)
{
return
bookQrcodeWxworkResponseVO
;
return
bookQrcodeWxworkResponseVO
;
}
}
Long
wxworkQrcodeId
=
bookQrcodeWxwork
.
getWxworkQrcodeId
();
bookQrcodeWxworkResponseVO
.
setWxworkQrcodeId
(
wxworkQrcodeId
);
bookQrcodeWxworkResponseVO
.
setWxworkQrcodeId
(
wxworkQrcodeId
);
bookQrcodeWxworkResponseVO
.
setGuide
(
bookQrcodeWxwork
.
getGuide
());
if
(
WxworkQrcodeType
.
SOP_QRCODE
.
getCode
().
equals
(
wxworkQrcodeType
))
{
if
(
WxworkQrcodeType
.
SOP_QRCODE
.
getCode
().
equals
(
wxworkQrcodeType
))
{
WxworkQrcodeBaseDTO
wxworkQrcodeBaseDTO
=
wechatGroupConsr
.
getWxworkQrcodeBaseById
(
wxworkQrcodeId
);
WxworkQrcodeBaseDTO
wxworkQrcodeBaseDTO
=
wechatGroupConsr
.
getWxworkQrcodeBaseById
(
wxworkQrcodeId
);
if
(
null
!=
wxworkQrcodeBaseDTO
)
{
if
(
null
!=
wxworkQrcodeBaseDTO
)
{
...
@@ -157,6 +165,12 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
...
@@ -157,6 +165,12 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
bookQrcodeWxworkResponseVO
.
setInvitationRays
(
groupQrcodeBaseDTO
.
getInvitationRays
());
bookQrcodeWxworkResponseVO
.
setInvitationRays
(
groupQrcodeBaseDTO
.
getInvitationRays
());
bookQrcodeWxworkResponseVO
.
setInvitationAccounts
(
groupQrcodeBaseDTO
.
getInvitationAccounts
());
bookQrcodeWxworkResponseVO
.
setInvitationAccounts
(
groupQrcodeBaseDTO
.
getInvitationAccounts
());
}
}
}
else
if
(
WxworkQrcodeType
.
CRM_QRCODE
.
getCode
().
equals
(
wxworkQrcodeType
))
{
CrmContactQrcodeVO
crmContactQrcodeVO
=
erpConsr
.
getContactQrcodeNameById4Adviser
(
wxworkQrcodeId
);
if
(
null
!=
crmContactQrcodeVO
)
{
bookQrcodeWxworkResponseVO
.
setWxworkQrcodeUrl
(
crmContactQrcodeVO
.
getQrcodeUrl
());
bookQrcodeWxworkResponseVO
.
setWxworkQrcodeName
(
crmContactQrcodeVO
.
getContactQrcodeName
());
}
}
}
return
bookQrcodeWxworkResponseVO
;
return
bookQrcodeWxworkResponseVO
;
}
}
...
@@ -313,6 +327,7 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
...
@@ -313,6 +327,7 @@ public class BookQrcodeWxworkBizImpl implements BookQrcodeWxworkBiz {
if
(
null
!=
crmContactQrcodeVO
)
{
if
(
null
!=
crmContactQrcodeVO
)
{
dto
.
setWxworkQrcodeUrl
(
crmContactQrcodeVO
.
getQrcodeUrl
());
dto
.
setWxworkQrcodeUrl
(
crmContactQrcodeVO
.
getQrcodeUrl
());
dto
.
setWxworkQrcodeName
(
crmContactQrcodeVO
.
getContactQrcodeName
());
dto
.
setWxworkQrcodeName
(
crmContactQrcodeVO
.
getContactQrcodeName
());
dto
.
setGuide
(
wxwork
.
getGuide
());
}
}
}
}
wxworkQrcodeDTOS
.
add
(
dto
);
wxworkQrcodeDTOS
.
add
(
dto
);
...
...
pcloud-service-book/src/main/java/com/pcloud/book/book/entity/BookQrcodeWxwork.java
View file @
20e96818
package
com
.
pcloud
.
book
.
book
.
entity
;
package
com
.
pcloud
.
book
.
book
.
entity
;
import
com.pcloud.common.entity.BaseEntity
;
import
com.pcloud.common.entity.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
...
@@ -45,4 +47,7 @@ public class BookQrcodeWxwork extends BaseEntity {
...
@@ -45,4 +47,7 @@ public class BookQrcodeWxwork extends BaseEntity {
*/
*/
private
Integer
wxworkQrcodeType
;
private
Integer
wxworkQrcodeType
;
@ApiModelProperty
(
"引导语"
)
private
String
guide
;
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/book/vo/request/BookQrcodeWxworkRequestVO.java
View file @
20e96818
...
@@ -21,4 +21,7 @@ public class BookQrcodeWxworkRequestVO {
...
@@ -21,4 +21,7 @@ public class BookQrcodeWxworkRequestVO {
private
Long
wxworkQrcodeId
;
private
Long
wxworkQrcodeId
;
@ApiModelProperty
(
"企业微信二维码类型(1sop活码2群活码)"
)
@ApiModelProperty
(
"企业微信二维码类型(1sop活码2群活码)"
)
private
Integer
wxworkQrcodeType
;
private
Integer
wxworkQrcodeType
;
@ApiModelProperty
(
"引导语"
)
private
String
guide
;
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/book/vo/response/BookQrcodeWxworkResponseVO.java
View file @
20e96818
...
@@ -74,4 +74,6 @@ public class BookQrcodeWxworkResponseVO extends BaseDto {
...
@@ -74,4 +74,6 @@ public class BookQrcodeWxworkResponseVO extends BaseDto {
* 群分类
* 群分类
*/
*/
private
String
classifyName
;
private
String
classifyName
;
@ApiModelProperty
(
"引导语"
)
private
String
guide
;
}
}
pcloud-service-book/src/main/resources/mapper/book/BookQrcodeWxworkDao.xml
View file @
20e96818
...
@@ -12,10 +12,11 @@
...
@@ -12,10 +12,11 @@
<result
property=
"wxworkQrcodeId"
column=
"wxwork_qrcode_id"
jdbcType=
"INTEGER"
/>
<result
property=
"wxworkQrcodeId"
column=
"wxwork_qrcode_id"
jdbcType=
"INTEGER"
/>
<result
property=
"wxworkQrcodeType"
column=
"wxwork_qrcode_type"
jdbcType=
"INTEGER"
/>
<result
property=
"wxworkQrcodeType"
column=
"wxwork_qrcode_type"
jdbcType=
"INTEGER"
/>
<result
property=
"createTime"
column=
"create_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"createTime"
column=
"create_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"guide"
column=
"guide"
jdbcType=
"VARCHAR"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id, book_id, channel_id, adviser_id, book_qrcode_type, book_qrcode_id, wxwork_qrcode_id, wxwork_qrcode_type, create_time
id, book_id, channel_id, adviser_id, book_qrcode_type, book_qrcode_id, wxwork_qrcode_id, wxwork_qrcode_type, create_time
, guide
</sql>
</sql>
<!--查询单个-->
<!--查询单个-->
<select
id=
"getById"
resultMap=
"BookQrcodeWxworkMap"
>
<select
id=
"getById"
resultMap=
"BookQrcodeWxworkMap"
>
...
@@ -28,9 +29,9 @@
...
@@ -28,9 +29,9 @@
<!--新增所有列-->
<!--新增所有列-->
<insert
id=
"insert"
keyProperty=
"id"
useGeneratedKeys=
"true"
>
<insert
id=
"insert"
keyProperty=
"id"
useGeneratedKeys=
"true"
>
insert into book.book_qrcode_wxwork(book_id, channel_id, adviser_id, book_qrcode_type, book_qrcode_id, wxwork_qrcode_id,
insert into book.book_qrcode_wxwork(book_id, channel_id, adviser_id, book_qrcode_type, book_qrcode_id, wxwork_qrcode_id,
wxwork_qrcode_type, create_time)
wxwork_qrcode_type, create_time
, guide
)
values (#{bookId}, #{channelId}, #{adviserId}, #{bookQrcodeType}, #{bookQrcodeId}, #{wxworkQrcodeId},
values (#{bookId}, #{channelId}, #{adviserId}, #{bookQrcodeType}, #{bookQrcodeId}, #{wxworkQrcodeId},
#{wxworkQrcodeType}, now())
#{wxworkQrcodeType}, now()
, #{guide}
)
</insert>
</insert>
<!--通过主键修改数据-->
<!--通过主键修改数据-->
...
...
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