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
adfda392
Commit
adfda392
authored
Aug 10, 2022
by
郑勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [1007915] 编辑运营需求(高级设置、书刊目录、题库、课文诵读、ERP、视频)
parent
48a64faf
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
166 additions
and
2 deletions
+166
-2
BookAdviserDto.java
...rc/main/java/com/pcloud/book/book/dto/BookAdviserDto.java
+5
-0
BookDto.java
...-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
+14
-0
BookAdviserBiz.java
...rc/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java
+4
-0
BookAdviserBizImpl.java
...ava/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
+46
-0
BookBizImpl.java
.../main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
+2
-1
BookAdviserDao.java
...rc/main/java/com/pcloud/book/book/dao/BookAdviserDao.java
+4
-0
BookAdviserDaoImpl.java
...ava/com/pcloud/book/book/dao/impl/BookAdviserDaoImpl.java
+19
-0
BookAdviserFacadeImpl.java
...m/pcloud/book/book/facade/impl/BookAdviserFacadeImpl.java
+25
-0
BookSet.java
...-book/src/main/java/com/pcloud/book/book/set/BookSet.java
+10
-0
BookAdviser.Mapper.xml
...ook/src/main/resources/mapper/book/BookAdviser.Mapper.xml
+37
-1
No files found.
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookAdviserDto.java
View file @
adfda392
...
...
@@ -148,4 +148,9 @@ public class BookAdviserDto extends BaseDto {
* 是否跳转本书
*/
private
Integer
isJumpBook
;
/**
* 是否开启教辅必备大礼包
*/
private
Integer
openGiftBag
;
}
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
View file @
adfda392
...
...
@@ -893,6 +893,20 @@ public class BookDto extends BaseDto {
*/
private
Integer
isFreeze
;
/**
* 是否k12书籍
* @return
*/
private
Integer
isK12
;
public
Integer
getIsK12
()
{
return
isK12
;
}
public
void
setIsK12
(
Integer
isK12
)
{
this
.
isK12
=
isK12
;
}
public
Integer
getIsFreeze
()
{
return
isFreeze
;
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java
View file @
adfda392
...
...
@@ -523,4 +523,8 @@ public interface BookAdviserBiz {
PageBeanNew
<
ErpAdviserBookVO
>
listAdviserBook4Erp4ES
(
String
isbn
,
String
uniqueNumber
,
String
adviserName
,
Long
agentId
,
Integer
currentPage
,
Integer
numPerPage
);
Integer
getBookCreateCount
(
Long
adviserId
,
String
startTime
);
void
updateOpenGiftBag
(
Long
bookId
,
Long
adviserId
,
Long
channelId
,
Integer
isOpenGiftBag
);
Integer
getOpenGiftBag
(
Long
sceneId
,
Long
bookId
,
Long
adviserId
,
Long
channelId
);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
View file @
adfda392
...
...
@@ -3799,4 +3799,50 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
Integer
count
=
bookAdviserDao
.
getBookCreateCount
(
adviserId
,
startTime
);
return
count
;
}
@Override
public
void
updateOpenGiftBag
(
Long
bookId
,
Long
adviserId
,
Long
channelId
,
Integer
isOpenGiftBag
)
{
if
(
ObjectUtil
.
hasEmpty
(
bookId
,
adviserId
,
channelId
,
isOpenGiftBag
))
{
throw
new
BizException
(
BizException
.
PARAM_IS_NULL
.
getCode
(),
"缺少参数!"
);
}
bookAdviserDao
.
updateOpenGiftBag
(
bookId
,
adviserId
,
channelId
,
isOpenGiftBag
);
}
@Override
public
Integer
getOpenGiftBag
(
Long
sceneId
,
Long
bookId
,
Long
adviserId
,
Long
channelId
)
{
if
(
null
==
sceneId
&&
null
==
bookId
&&
null
==
adviserId
&&
null
==
channelId
)
{
return
null
;
}
Integer
result
=
null
;
BookAdviserDto
base
=
null
;
if
(
null
!=
bookId
)
{
base
=
bookAdviserDao
.
getBase
(
bookId
,
channelId
,
adviserId
);
}
else
if
(
null
!=
sceneId
)
{
//根据sceneId获取二维码信息
Map
<
Long
,
QrcodeSceneDto
>
qrcodeSceneDtoMap
=
qrcodeSceneConsr
.
listBaseInfoByIds
(
Lists
.
newArrayList
(
sceneId
));
if
(
MapUtils
.
isEmpty
(
qrcodeSceneDtoMap
)
||
null
==
qrcodeSceneDtoMap
.
get
(
sceneId
))
{
return
result
;
}
QrcodeSceneDto
qrcodeSceneDto
=
qrcodeSceneDtoMap
.
get
(
sceneId
);
if
(
null
==
qrcodeSceneDto
||
null
==
qrcodeSceneDto
.
getAdviserBookId
())
{
return
result
;
}
base
=
bookAdviserDao
.
getBase
(
qrcodeSceneDto
.
getAdviserBookId
(),
qrcodeSceneDto
.
getChannelPartyId
(),
qrcodeSceneDto
.
getCreatedByUserLogin
());
}
if
(
null
==
base
){
return
null
;
}
result
=
base
.
getOpenGiftBag
();
if
(
null
==
result
){
//就是没有设置过,没有设置过。如果是k12的默认打开
if
(
CollUtil
.
toList
(
RightsSettingConstant
.
K12_TEMPLET_ID_NEW
).
contains
(
base
.
getTempletId
()))
{
bookAdviserDao
.
updateOpenGiftBag
(
base
.
getBookId
(),
base
.
getAdviserId
(),
base
.
getChannelId
(),
1
);
result
=
1
;
}
else
{
bookAdviserDao
.
updateOpenGiftBag
(
base
.
getBookId
(),
base
.
getAdviserId
(),
base
.
getChannelId
(),
0
);
result
=
0
;
}
}
return
result
;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
View file @
adfda392
...
...
@@ -847,7 +847,8 @@ public class BookBizImpl implements BookBiz {
bookSet
.
setErpNumbers
(
bookDto
);
// 尝试加载创建人(ERP运维人员)
bookSet
.
setUploadUserId
(
bookDto
);
// 设置是否k12书刊
bookSet
.
setIsK12
(
bookDto
);
return
bookDto
;
}
...
...
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookAdviserDao.java
View file @
adfda392
...
...
@@ -361,4 +361,8 @@ public interface BookAdviserDao extends BaseDao<BookAdviser> {
Integer
getBookIsOpenCatalog
(
Long
bookId
,
Long
channelId
,
Long
adviserId
);
Integer
getBookCreateCount
(
Long
adviserId
,
String
startTime
);
void
updateOpenGiftBag
(
Long
bookId
,
Long
adviserId
,
Long
channelId
,
Integer
isOpenGiftBag
);
Integer
getOpenGiftBag
(
Long
bookId
,
Long
adviserId
,
Long
channelId
);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookAdviserDaoImpl.java
View file @
adfda392
...
...
@@ -564,4 +564,23 @@ public class BookAdviserDaoImpl extends BaseDaoImpl<BookAdviser> implements Book
paramMap
.
put
(
"startTime"
,
startTime
);
return
getSessionTemplate
().
selectOne
(
getStatement
(
"getBookCreateCount"
),
paramMap
);
}
@Override
public
void
updateOpenGiftBag
(
Long
bookId
,
Long
adviserId
,
Long
channelId
,
Integer
isOpenGiftBag
)
{
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<>();
paramMap
.
put
(
"bookId"
,
bookId
);
paramMap
.
put
(
"channelId"
,
channelId
);
paramMap
.
put
(
"adviserId"
,
adviserId
);
paramMap
.
put
(
"isOpenGiftBag"
,
isOpenGiftBag
);
getSessionTemplate
().
update
(
getStatement
(
"updateOpenGiftBag"
),
paramMap
);
}
@Override
public
Integer
getOpenGiftBag
(
Long
bookId
,
Long
adviserId
,
Long
channelId
)
{
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<>();
paramMap
.
put
(
"bookId"
,
bookId
);
paramMap
.
put
(
"channelId"
,
channelId
);
paramMap
.
put
(
"adviserId"
,
adviserId
);
return
getSessionTemplate
().
selectOne
(
getStatement
(
"getOpenGiftBag"
),
paramMap
);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookAdviserFacadeImpl.java
View file @
adfda392
...
...
@@ -606,4 +606,29 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade {
bookAdviserBiz
.
updateOpenRaysCode
(
bookAdviser
);
return
new
ResponseDto
<>();
}
/**
* 设置是否开启教辅必备大礼包
*/
@RequestMapping
(
value
=
"updateOpenGiftBag"
,
method
=
RequestMethod
.
GET
)
public
ResponseDto
<?>
updateOpenGiftBag
(
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
(
value
=
"bookId"
)
Long
bookId
,
@RequestParam
(
value
=
"channelId"
)
Long
channelId
,
@RequestParam
(
value
=
"isOpenGiftBag"
)
Integer
isOpenGiftBag
)
throws
PermissionException
{
Long
adviserId
=
(
Long
)
SessionUtil
.
getVlaue
(
token
,
SessionUtil
.
PARTY_ID
);
bookAdviserBiz
.
updateOpenGiftBag
(
bookId
,
adviserId
,
channelId
,
isOpenGiftBag
);
return
new
ResponseDto
<>();
}
/**
* 查看是否开启教辅必备大礼包
*/
@RequestMapping
(
value
=
"getOpenGiftBag"
,
method
=
RequestMethod
.
GET
)
public
ResponseDto
<?>
getOpenGiftBag
(
@RequestParam
(
value
=
"sceneId"
,
required
=
false
)
Long
sceneId
,
@RequestParam
(
value
=
"bookId"
,
required
=
false
)
Long
bookId
,
@RequestParam
(
value
=
"adviserId"
,
required
=
false
)
Long
adviserId
,
@RequestParam
(
value
=
"channelId"
,
required
=
false
)
Long
channelId
)
throws
PermissionException
{
return
new
ResponseDto
<>(
bookAdviserBiz
.
getOpenGiftBag
(
sceneId
,
bookId
,
adviserId
,
channelId
));
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java
View file @
adfda392
...
...
@@ -63,6 +63,7 @@ import com.pcloud.book.group.dao.BookGroupDao;
import
com.pcloud.book.group.dto.BookGroupDTO
;
import
com.pcloud.book.group.dto.BookGroupServeCountDTO
;
import
com.pcloud.book.group.dto.BookGroupStatisticDTO
;
import
com.pcloud.book.rightsSetting.constants.RightsSettingConstant
;
import
com.pcloud.book.util.common.ThreadPoolUtils
;
import
com.pcloud.channelcenter.base.constants.ChannelConstants
;
import
com.pcloud.channelcenter.base.constants.MessageFromTypeEnum
;
...
...
@@ -91,6 +92,7 @@ import com.pcloud.contentcenter.resource.dto.ResourceDTO;
import
com.pcloud.data.domain.enums.YesNoEnum
;
import
com.pcloud.data.domain.vo.AllAdviserBookStatisVO
;
import
com.pcloud.labelcenter.label.service.LabelService
;
import
com.pcloud.readercenter.common.enums.YesOrNoNumEnum
;
import
com.pcloud.resourcecenter.product.dto.ProductDto
;
import
com.pcloud.resourcecenter.product.dto.ProductTypeDto
;
import
com.pcloud.resourcecenter.product.dto.SpecificationDto
;
...
...
@@ -2220,4 +2222,12 @@ public class BookSet {
}
}
}
public
void
setIsK12
(
BookDto
bookDto
)
{
if
(
CollUtil
.
toList
(
RightsSettingConstant
.
K12_TEMPLET_ID_NEW
).
contains
(
bookDto
.
getTempletId
()))
{
bookDto
.
setIsK12
(
YesOrNoNumEnum
.
YES
.
getValue
());
}
else
{
bookDto
.
setIsK12
(
YesOrNoNumEnum
.
NO
.
getValue
());
}
}
}
pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml
View file @
adfda392
...
...
@@ -28,6 +28,7 @@
<result
column=
"pur_label_id"
property=
"purLabelId"
jdbcType=
"BIGINT"
/>
<result
column=
"is_open_catalog"
property=
"isOpenCatalog"
jdbcType=
"BIT"
/>
<result
column=
"is_jump_book"
property=
"isJumpBook"
jdbcType=
"TINYINT"
/>
<result
column=
"open_gift_bag"
property=
"openGiftBag"
jdbcType=
"INTEGER"
/>
</resultMap>
<resultMap
id=
"manageAdviserMap"
type=
"adviserManageDto"
>
...
...
@@ -126,7 +127,7 @@
BOOK_ADVISER_ID, BOOK_ID, TEMPLET_ID, CHANNEL_ID, ADVISER_ID, IS_DELETE,
TEMPLET_ID,SECOND_TEMPLET_ID,third_templet_id,
GRA_LABEL_ID,SUB_LABEL_ID,VER_LABEL_ID,AREA_LABEL_ID,is_open_robot_process,vol_label_id,
is_open_catalog, pur_label_id, dep_label_id, pro_label_id, is_jump_book
is_open_catalog, pur_label_id, dep_label_id, pro_label_id, is_jump_book
,open_gift_bag
FROM
BOOK_ADVISER
WHERE
...
...
@@ -1443,4 +1444,39 @@
AND CREATED_DATE > #{startTime}
</if>
</select>
<update
id=
"updateOpenGiftBag"
parameterType=
"map"
>
update
book_adviser
set
open_gift_bag = #{isOpenGiftBag},
last_modified_date = NOW()
where
book_id = #{bookId, jdbcType=BIGINT}
AND
adviser_id = #{adviserId, jdbcType=BIGINT}
AND
channel_id = #{channelId, jdbcType=BIGINT}
and
is_delete = 0
</update>
<select
id=
"getOpenGiftBag"
parameterType=
"map"
resultType=
"Integer"
>
select
open_gift_bag
from
book_adviser
where
book_id = #{bookId}
<if
test=
"adviserId != null"
>
and adviser_id = #{adviserId}
</if>
<if
test=
"channelId != null"
>
and channel_id = #{channelId}
</if>
and
is_delete = 0
limit 1
</select>
</mapper>
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