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
78409807
Commit
78409807
authored
Nov 27, 2020
by
朱亚洁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:[1003780]背单词小程序
parent
c4ef8dbf
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
63 additions
and
1 deletions
+63
-1
AppletService.java
...in/java/com/pcloud/book/applet/service/AppletService.java
+6
-0
AppletServiceImpl.java
...om/pcloud/book/applet/service/impl/AppletServiceImpl.java
+11
-0
RightsSettingBiz.java
...a/com/pcloud/book/rightsSetting/biz/RightsSettingBiz.java
+8
-0
RightsSettingBizImpl.java
...oud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
+5
-0
RightsNowPopupDao.java
.../com/pcloud/book/rightsSetting/dao/RightsNowPopupDao.java
+9
-0
RightsNowPopupDaoImpl.java
...ud/book/rightsSetting/dao/impl/RightsNowPopupDaoImpl.java
+9
-0
RightsNowPopupType.java
...m/pcloud/book/rightsSetting/enums/RightsNowPopupType.java
+5
-1
RightsNowPopupDao.xml
...main/resources/mapper/rightssetting/RightsNowPopupDao.xml
+10
-0
No files found.
pcloud-facade-book/src/main/java/com/pcloud/book/applet/service/AppletService.java
View file @
78409807
...
@@ -61,4 +61,10 @@ public interface AppletService {
...
@@ -61,4 +61,10 @@ public interface AppletService {
*/
*/
@PostMapping
(
"getList4Collect"
)
@PostMapping
(
"getList4Collect"
)
ResponseEntity
<
ResponseDto
<
List
<
ServeCollectDTO
>>>
getList4Collect
(
@RequestBody
List
<
ServeCollectDTO
>
serveCollects
);
ResponseEntity
<
ResponseDto
<
List
<
ServeCollectDTO
>>>
getList4Collect
(
@RequestBody
List
<
ServeCollectDTO
>
serveCollects
);
@ApiOperation
(
"查弹窗弹出次数"
)
@GetMapping
(
"getPopupCount"
)
ResponseEntity
<
ResponseDto
<
Integer
>>
getPopupCount
(
@RequestParam
(
"wechatUserId"
)
Long
wechatUserId
,
@RequestParam
(
"bookId"
)
Long
bookId
,
@RequestParam
(
"popupType"
)
Integer
popupType
);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/service/impl/AppletServiceImpl.java
View file @
78409807
...
@@ -11,6 +11,7 @@ import com.pcloud.book.applet.dto.AppletOuterBookDTO;
...
@@ -11,6 +11,7 @@ import com.pcloud.book.applet.dto.AppletOuterBookDTO;
import
com.pcloud.book.applet.dto.PcloudGroupActivityDTO
;
import
com.pcloud.book.applet.dto.PcloudGroupActivityDTO
;
import
com.pcloud.book.applet.dto.ServeCollectDTO
;
import
com.pcloud.book.applet.dto.ServeCollectDTO
;
import
com.pcloud.book.applet.service.AppletService
;
import
com.pcloud.book.applet.service.AppletService
;
import
com.pcloud.book.rightsSetting.biz.RightsSettingBiz
;
import
com.pcloud.book.skill.biz.PcloudGroupActivityBiz
;
import
com.pcloud.book.skill.biz.PcloudGroupActivityBiz
;
import
com.pcloud.book.skill.entity.PcloudGroupActivity
;
import
com.pcloud.book.skill.entity.PcloudGroupActivity
;
import
com.pcloud.common.dto.ResponseDto
;
import
com.pcloud.common.dto.ResponseDto
;
...
@@ -56,6 +57,8 @@ public class AppletServiceImpl implements AppletService {
...
@@ -56,6 +57,8 @@ public class AppletServiceImpl implements AppletService {
private
AppletThirdResourcesStaticBiz
appletThirdResourcesStaticBiz
;
private
AppletThirdResourcesStaticBiz
appletThirdResourcesStaticBiz
;
@Autowired
@Autowired
private
ServeCollectBiz
serveCollectBiz
;
private
ServeCollectBiz
serveCollectBiz
;
@Autowired
private
RightsSettingBiz
rightsSettingBiz
;
@Override
@Override
...
@@ -108,4 +111,12 @@ public class AppletServiceImpl implements AppletService {
...
@@ -108,4 +111,12 @@ public class AppletServiceImpl implements AppletService {
public
ResponseEntity
<
ResponseDto
<
List
<
ServeCollectDTO
>>>
getList4Collect
(
@RequestBody
List
<
ServeCollectDTO
>
serveCollects
)
{
public
ResponseEntity
<
ResponseDto
<
List
<
ServeCollectDTO
>>>
getList4Collect
(
@RequestBody
List
<
ServeCollectDTO
>
serveCollects
)
{
return
ResponseHandleUtil
.
toResponse
(
serveCollectBiz
.
getList4Collect
(
serveCollects
));
return
ResponseHandleUtil
.
toResponse
(
serveCollectBiz
.
getList4Collect
(
serveCollects
));
}
}
@Override
@GetMapping
(
"getPopupCount"
)
public
ResponseEntity
<
ResponseDto
<
Integer
>>
getPopupCount
(
@RequestParam
(
"wechatUserId"
)
Long
wechatUserId
,
@RequestParam
(
"bookId"
)
Long
bookId
,
@RequestParam
(
"popupType"
)
Integer
popupType
){
return
ResponseHandleUtil
.
toResponse
(
rightsSettingBiz
.
getPopupCount
(
wechatUserId
,
bookId
,
popupType
));
}
}
}
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/RightsSettingBiz.java
View file @
78409807
...
@@ -200,4 +200,12 @@ public interface RightsSettingBiz {
...
@@ -200,4 +200,12 @@ public interface RightsSettingBiz {
AppletNewsDTO
getAppletNewsDTO4UserReadBook
(
AppletUserBookcase
userReadBook
);
AppletNewsDTO
getAppletNewsDTO4UserReadBook
(
AppletUserBookcase
userReadBook
);
QrcodeMessage4WechatVO
getRightsItemGroupsByBookGroup
(
Long
bookGroupId
,
Long
wechatUserId
);
QrcodeMessage4WechatVO
getRightsItemGroupsByBookGroup
(
Long
bookGroupId
,
Long
wechatUserId
);
/**
* 查弹窗弹出次数
* @author:zhuyajie
* @date:2020/11/20 16:58
* * @param null
*/
Integer
getPopupCount
(
Long
wechatUserId
,
Long
bookId
,
Integer
popupType
);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
View file @
78409807
...
@@ -1732,6 +1732,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
...
@@ -1732,6 +1732,11 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
return
qrcodeMessage4WechatVO
;
return
qrcodeMessage4WechatVO
;
}
}
@Override
public
Integer
getPopupCount
(
Long
wechatUserId
,
Long
bookId
,
Integer
popupType
)
{
return
rightsNowPopupDao
.
getPopupCount
(
wechatUserId
,
bookId
,
popupType
);
}
private
void
fillGiftCouponPack
(
RightsSetting
rightsSetting
,
Integer
readType
)
{
private
void
fillGiftCouponPack
(
RightsSetting
rightsSetting
,
Integer
readType
)
{
RightsSettingTitle
rightsSettingTitle
=
getRightsSettingTitle
(
rightsSetting
,
RightsNowItemTypeNew
.
GIFT_COUPON_PACKAGE
,
readType
);
RightsSettingTitle
rightsSettingTitle
=
getRightsSettingTitle
(
rightsSetting
,
RightsNowItemTypeNew
.
GIFT_COUPON_PACKAGE
,
readType
);
if
(
null
!=
rightsSettingTitle
){
if
(
null
!=
rightsSettingTitle
){
...
...
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/RightsNowPopupDao.java
View file @
78409807
...
@@ -26,4 +26,12 @@ public interface RightsNowPopupDao extends BaseDao<RightsNowPopup>{
...
@@ -26,4 +26,12 @@ public interface RightsNowPopupDao extends BaseDao<RightsNowPopup>{
* * @param null
* * @param null
*/
*/
Integer
getUserPopupClickCountByServe
(
RightsNowPopup
rightsNowPopup
);
Integer
getUserPopupClickCountByServe
(
RightsNowPopup
rightsNowPopup
);
/**
* 查弹出次数
* @author:zhuyajie
* @date:2020/11/20 16:58
* * @param null
*/
Integer
getPopupCount
(
Long
wechatUserId
,
Long
bookId
,
Integer
popupType
);
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/impl/RightsNowPopupDaoImpl.java
View file @
78409807
...
@@ -34,4 +34,13 @@ public class RightsNowPopupDaoImpl extends BaseDaoImpl<RightsNowPopup> implement
...
@@ -34,4 +34,13 @@ public class RightsNowPopupDaoImpl extends BaseDaoImpl<RightsNowPopup> implement
public
Integer
getUserPopupClickCountByServe
(
RightsNowPopup
rightsNowPopup
)
{
public
Integer
getUserPopupClickCountByServe
(
RightsNowPopup
rightsNowPopup
)
{
return
getSessionTemplate
().
selectOne
(
getStatement
(
"getUserPopupClickCountByServe"
),
rightsNowPopup
);
return
getSessionTemplate
().
selectOne
(
getStatement
(
"getUserPopupClickCountByServe"
),
rightsNowPopup
);
}
}
@Override
public
Integer
getPopupCount
(
Long
wechatUserId
,
Long
bookId
,
Integer
popupType
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"wechatUserId"
,
wechatUserId
);
map
.
put
(
"bookId"
,
bookId
);
map
.
put
(
"popupType"
,
popupType
);
return
getSessionTemplate
().
selectOne
(
getStatement
(
"getPopupCount"
),
map
);
}
}
}
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/enums/RightsNowPopupType.java
View file @
78409807
...
@@ -16,7 +16,11 @@ public enum RightsNowPopupType {
...
@@ -16,7 +16,11 @@ public enum RightsNowPopupType {
/**
/**
* 4十一假期期间弹窗
* 4十一假期期间弹窗
*/
*/
NATIONAL_DAY_POPUP
(
4
);
NATIONAL_DAY_POPUP
(
4
),
/**
* 5背单词小程序
*/
WORD_APPLET
(
5
);
public
final
Integer
value
;
public
final
Integer
value
;
...
...
pcloud-service-book/src/main/resources/mapper/rightssetting/RightsNowPopupDao.xml
View file @
78409807
...
@@ -49,4 +49,13 @@
...
@@ -49,4 +49,13 @@
and serve_type = #{serveType}
and serve_type = #{serveType}
</select>
</select>
<select
id=
"getPopupCount"
parameterType=
"map"
resultType=
"integer"
>
SELECT COUNT(1) FROM book.rights_now_popup
WHERE wechat_user_id = #{wechatUserId}
and book_id = #{bookId}
and popup_type = #{popupType}
AND record_type = 1
</select>
</mapper>
</mapper>
\ No newline at end of file
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