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
557f4d40
Commit
557f4d40
authored
Dec 23, 2020
by
郑江涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [1004094] 丢失页面购书申请指引用户路径优化
parent
38490458
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
594 additions
and
10 deletions
+594
-10
BuyBookRequestBiz.java
...in/java/com/pcloud/book/applet/biz/BuyBookRequestBiz.java
+39
-2
BuyBookRequestReplyBiz.java
...va/com/pcloud/book/applet/biz/BuyBookRequestReplyBiz.java
+30
-0
BuyBookRequestBizImpl.java
...om/pcloud/book/applet/biz/impl/BuyBookRequestBizImpl.java
+0
-0
BuyBookRequestReplyBizImpl.java
...loud/book/applet/biz/impl/BuyBookRequestReplyBizImpl.java
+52
-0
BuyBookRequestDao.java
...in/java/com/pcloud/book/applet/dao/BuyBookRequestDao.java
+12
-0
BuyBookRequestReplyDao.java
...va/com/pcloud/book/applet/dao/BuyBookRequestReplyDao.java
+20
-0
BuyBookRequestDaoImpl.java
...om/pcloud/book/applet/dao/impl/BuyBookRequestDaoImpl.java
+26
-0
BuyBookRequestReplyDaoImpl.java
...loud/book/applet/dao/impl/BuyBookRequestReplyDaoImpl.java
+30
-0
BuyBookRequestDTO.java
...in/java/com/pcloud/book/applet/dto/BuyBookRequestDTO.java
+21
-0
BuyBookRequestReplyDTO.java
...va/com/pcloud/book/applet/dto/BuyBookRequestReplyDTO.java
+24
-0
BuyBookRequest.java
...in/java/com/pcloud/book/applet/entity/BuyBookRequest.java
+16
-0
BuyBookRequestReply.java
...va/com/pcloud/book/applet/entity/BuyBookRequestReply.java
+27
-0
BuyBookRequestFacade.java
...a/com/pcloud/book/applet/facade/BuyBookRequestFacade.java
+47
-5
BuyBookRequestReplyFacade.java
.../pcloud/book/applet/facade/BuyBookRequestReplyFacade.java
+51
-0
ReaderConsr.java
...ain/java/com/pcloud/book/consumer/reader/ReaderConsr.java
+15
-0
BuyBookRequest.Mapper.xml
...rc/main/resources/mapper/applet/BuyBookRequest.Mapper.xml
+111
-3
BuyBookRequestReplyMapper.xml
...ain/resources/mapper/applet/BuyBookRequestReplyMapper.xml
+73
-0
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/BuyBookRequestBiz.java
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
biz
;
package
com
.
pcloud
.
book
.
applet
.
biz
;
import
com.pcloud.book.applet.dto.BuyBookRequestDTO
;
import
com.pcloud.book.applet.dto.BuyBookRequetUserDTO
;
import
com.pcloud.book.applet.dto.BuyBookRequetUserDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.common.page.PageBeanNew
;
import
com.pcloud.common.page.PageBeanNew
;
import
java.util.List
;
/**
/**
* (BuyBookRequest)表服务接口
* (BuyBookRequest)表服务接口
*
*
...
@@ -18,7 +21,7 @@ public interface BuyBookRequestBiz {
...
@@ -18,7 +21,7 @@ public interface BuyBookRequestBiz {
* @param id 主键
* @param id 主键
* @return 实例对象
* @return 实例对象
*/
*/
BuyBookRequest
getById
(
Long
id
);
BuyBookRequest
DTO
getById
(
Long
id
);
/**
/**
* 分页查询
* 分页查询
...
@@ -31,7 +34,7 @@ public interface BuyBookRequestBiz {
...
@@ -31,7 +34,7 @@ public interface BuyBookRequestBiz {
* @param buyBookRequest 实例对象
* @param buyBookRequest 实例对象
* @return 主键
* @return 主键
*/
*/
Long
insert
(
BuyBookRequest
buyBookRequest
);
Long
insert
(
BuyBookRequest
buyBookRequest
,
Long
officialAccountId
);
/**
/**
* 修改数据
* 修改数据
...
@@ -63,4 +66,37 @@ public interface BuyBookRequestBiz {
...
@@ -63,4 +66,37 @@ public interface BuyBookRequestBiz {
* @param partyId
* @param partyId
*/
*/
void
exportRequestList
(
Long
agentId
,
Integer
currentPage
,
Integer
numPerPage
,
Long
partyId
);
void
exportRequestList
(
Long
agentId
,
Integer
currentPage
,
Integer
numPerPage
,
Long
partyId
);
/**
* 查询用户不同状态记录
* @param wechatUserId
* @param state
* @return
*/
PageBeanNew
getByState
(
Integer
currentPage
,
Integer
numPerPage
,
Long
wechatUserId
,
Integer
state
,
Integer
requestEvn
);
/**
* 假删除数据
* @param requestId
*/
void
fakeDelete
(
Long
requestId
);
/**
* 根据微信UserId获取记录id列表
* @param wechatUserId
* @return
*/
List
<
Long
>
listIdsByWeChatUserId
(
Long
wechatUserId
);
/**
* 获取所有的用户wechatId
* @return
*/
List
<
Long
>
listAllWeChatUserId
();
/**
* 处理数据:根据wechatId填充mini_wechat_user_id,wechat_nick_name,mini_open_id
* reply_state,is_delete
*/
void
processingData
(
Integer
open
);
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/BuyBookRequestReplyBiz.java
0 → 100644
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
biz
;
import
com.pcloud.book.applet.dto.BuyBookRequestReplyDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequestReply
;
import
com.pcloud.common.exceptions.BizException
;
import
java.util.List
;
/**
* (BuyBookRequest)表服务接口
*
* @author Dominic_Z
* @since 2020年12月25日 16:02:04
*/
public
interface
BuyBookRequestReplyBiz
{
/**
* 新增回复记录
*
* @param buyBookRequestReply
* @return
*/
Long
insert
(
BuyBookRequestReply
buyBookRequestReply
);
List
<
BuyBookRequestReplyDTO
>
getByRequestId
(
Long
requestId
);
void
deleteById
(
Long
id
);
List
<
BuyBookRequestReplyDTO
>
getListByIds
(
List
<
Long
>
requestIds
)
throws
BizException
;
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/BuyBookRequestBizImpl.java
View file @
557f4d40
This diff is collapsed.
Click to expand it.
pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/BuyBookRequestReplyBizImpl.java
0 → 100644
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
biz
.
impl
;
import
com.pcloud.book.applet.biz.BuyBookRequestReplyBiz
;
import
com.pcloud.book.applet.dao.BuyBookRequestDao
;
import
com.pcloud.book.applet.dao.BuyBookRequestReplyDao
;
import
com.pcloud.book.applet.dto.BuyBookRequestReplyDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.book.applet.entity.BuyBookRequestReply
;
import
com.pcloud.common.exceptions.BizException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
@Service
(
"buyBookRequestReplyBiz"
)
public
class
BuyBookRequestReplyBizImpl
implements
BuyBookRequestReplyBiz
{
@Autowired
private
BuyBookRequestReplyDao
buyBookRequestReplyDao
;
@Autowired
private
BuyBookRequestDao
buyBookRequestDao
;
@Override
public
Long
insert
(
BuyBookRequestReply
buyBookRequestReply
)
{
//回复消息后,将购书记录更改为已回复状态.
Long
requestId
=
buyBookRequestReply
.
getRequestId
();
BuyBookRequest
buyBookRequest
=
new
BuyBookRequest
();
buyBookRequest
.
setId
(
requestId
);
buyBookRequest
.
setReplyState
(
1
);
buyBookRequestDao
.
update
(
buyBookRequest
);
return
buyBookRequestReplyDao
.
insert
(
buyBookRequestReply
);
}
@Override
public
List
<
BuyBookRequestReplyDTO
>
getByRequestId
(
Long
requestId
)
{
return
buyBookRequestReplyDao
.
getByRequestId
(
requestId
);
}
@Override
public
void
deleteById
(
Long
id
)
{
if
(
null
==
id
){
throw
BizException
.
PARAM_IS_NULL
;
}
buyBookRequestReplyDao
.
deleteById
(
id
);
}
@Override
public
List
<
BuyBookRequestReplyDTO
>
getListByIds
(
List
<
Long
>
requestIds
)
throws
BizException
{
return
buyBookRequestReplyDao
.
getListByIds
(
requestIds
);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/BuyBookRequestDao.java
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
dao
;
package
com
.
pcloud
.
book
.
applet
.
dao
;
import
com.pcloud.book.applet.dto.BuyBookRequestDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.common.core.dao.BaseDao
;
import
com.pcloud.common.core.dao.BaseDao
;
import
com.pcloud.common.page.PageBeanNew
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* (BuyBookRequest)表数据库访问层
* (BuyBookRequest)表数据库访问层
...
@@ -14,4 +17,12 @@ import java.util.List;
...
@@ -14,4 +17,12 @@ import java.util.List;
public
interface
BuyBookRequestDao
extends
BaseDao
<
BuyBookRequest
>
{
public
interface
BuyBookRequestDao
extends
BaseDao
<
BuyBookRequest
>
{
List
<
BuyBookRequest
>
getUserCount
();
List
<
BuyBookRequest
>
getUserCount
();
PageBeanNew
getRequestByWechatUserIdAndState
(
Integer
currentPage
,
Integer
numPerPage
,
Map
<
String
,
Object
>
param
);
List
<
Long
>
listIdsByWeChatUserId
(
Long
wechatUserId
);
List
<
Long
>
listAllWeChatUserId
();
void
update2ProcessingData
(
Map
<
String
,
Object
>
param
);
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/BuyBookRequestReplyDao.java
0 → 100644
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
dao
;
import
com.pcloud.book.applet.dto.BuyBookRequestReplyDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequestReply
;
import
com.pcloud.common.core.dao.BaseDao
;
import
java.util.List
;
/**
* (BuyBookRequestReply)表数据库访问层
*
* @author dominic_Z
* @since 2020年12月25日 14:43:22
*/
public
interface
BuyBookRequestReplyDao
extends
BaseDao
<
BuyBookRequestReply
>
{
List
<
BuyBookRequestReplyDTO
>
getByRequestId
(
Long
requestId
);
List
<
BuyBookRequestReplyDTO
>
getListByIds
(
List
<
Long
>
requestIds
);
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/impl/BuyBookRequestDaoImpl.java
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
dao
.
impl
;
package
com
.
pcloud
.
book
.
applet
.
dao
.
impl
;
import
com.pcloud.book.applet.dao.BuyBookRequestDao
;
import
com.pcloud.book.applet.dao.BuyBookRequestDao
;
import
com.pcloud.book.applet.dto.BuyBookRequestDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.common.core.dao.BaseDaoImpl
;
import
com.pcloud.common.core.dao.BaseDaoImpl
;
import
com.pcloud.common.page.PageBeanNew
;
import
com.pcloud.common.page.PageParam
;
import
org.springframework.data.repository.query.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* (BuyBookRequest)表数据库访问层
* (BuyBookRequest)表数据库访问层
...
@@ -20,4 +25,24 @@ public class BuyBookRequestDaoImpl extends BaseDaoImpl<BuyBookRequest> implement
...
@@ -20,4 +25,24 @@ public class BuyBookRequestDaoImpl extends BaseDaoImpl<BuyBookRequest> implement
public
List
<
BuyBookRequest
>
getUserCount
()
{
public
List
<
BuyBookRequest
>
getUserCount
()
{
return
getSessionTemplate
().
selectList
(
getStatement
(
"getUserCount"
));
return
getSessionTemplate
().
selectList
(
getStatement
(
"getUserCount"
));
}
}
@Override
public
PageBeanNew
getRequestByWechatUserIdAndState
(
Integer
currentPage
,
Integer
numPerPage
,
Map
<
String
,
Object
>
param
)
{
return
this
.
listPageNew
(
new
PageParam
(
currentPage
,
numPerPage
),
param
,
"getRequestByWechatUserIdAndState"
);
}
@Override
public
List
<
Long
>
listIdsByWeChatUserId
(
Long
wechatUserId
)
{
return
getSessionTemplate
().
selectList
(
getStatement
(
"listIdsByWeChatUserId"
));
}
@Override
public
List
<
Long
>
listAllWeChatUserId
()
{
return
getSessionTemplate
().
selectList
(
getStatement
(
"listAllWeChatUserId"
));
}
@Override
public
void
update2ProcessingData
(
Map
<
String
,
Object
>
param
)
{
this
.
getSessionTemplate
().
update
(
getStatement
(
"update2ProcessingData"
),
param
);
}
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/impl/BuyBookRequestReplyDaoImpl.java
0 → 100644
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
dao
.
impl
;
import
com.pcloud.book.applet.dao.BuyBookRequestReplyDao
;
import
com.pcloud.book.applet.dto.BuyBookRequestReplyDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequestReply
;
import
com.pcloud.common.core.dao.BaseDaoImpl
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
import
java.util.Map
;
/**
* (BuyBookRequestReply)表数据库访问层
*
* @author dominic_Z
* @since 2020年12月25日 14:51:00
*/
@Repository
(
"buyBookRequestReplyDaoImpl"
)
public
class
BuyBookRequestReplyDaoImpl
extends
BaseDaoImpl
<
BuyBookRequestReply
>
implements
BuyBookRequestReplyDao
{
@Override
public
List
<
BuyBookRequestReplyDTO
>
getByRequestId
(
Long
requestId
)
{
return
getSessionTemplate
().
selectList
(
"getByRequestId"
,
requestId
);
}
@Override
public
List
<
BuyBookRequestReplyDTO
>
getListByIds
(
List
<
Long
>
requestIds
)
{
return
getSessionTemplate
().
selectList
(
getStatement
(
"listBaseMapByIds"
),
requestIds
);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/BuyBookRequestDTO.java
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
dto
;
package
com
.
pcloud
.
book
.
applet
.
dto
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
@Data
@Data
public
class
BuyBookRequestDTO
{
public
class
BuyBookRequestDTO
{
...
@@ -34,9 +36,28 @@ public class BuyBookRequestDTO {
...
@@ -34,9 +36,28 @@ public class BuyBookRequestDTO {
private
String
address
;
private
String
address
;
private
List
<
BuyBookRequestReplyDTO
>
replyList
;
@ApiModelProperty
(
"小程序id"
)
private
Long
miniWechatUserId
;
@ApiModelProperty
(
"小程序openId"
)
private
String
miniOpenId
;
@ApiModelProperty
(
"微信昵称"
)
private
String
nickName
;
@ApiModelProperty
(
"是否回复"
)
private
Integer
replyState
;
@ApiModelProperty
(
"是否删除"
)
private
Integer
isDelete
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
private
Date
createTime
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
updateTime
;
private
Date
updateTime
;
private
String
isbn
;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/BuyBookRequestReplyDTO.java
0 → 100644
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
dto
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
java.util.Date
;
@Data
public
class
BuyBookRequestReplyDTO
{
private
Long
id
;
private
Long
requestId
;
private
String
replyMessage
;
private
Long
channelId
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
updateTime
;
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/entity/BuyBookRequest.java
View file @
557f4d40
...
@@ -2,6 +2,7 @@ package com.pcloud.book.applet.entity;
...
@@ -2,6 +2,7 @@ package com.pcloud.book.applet.entity;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.pcloud.common.entity.BaseEntity
;
import
com.pcloud.common.entity.BaseEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -35,6 +36,21 @@ public class BuyBookRequest extends BaseEntity {
...
@@ -35,6 +36,21 @@ public class BuyBookRequest extends BaseEntity {
private
String
address
;
private
String
address
;
@ApiModelProperty
(
"小程序id"
)
private
Long
miniWechatUserId
;
@ApiModelProperty
(
"小程序openId"
)
private
String
miniOpenId
;
@ApiModelProperty
(
"微信昵称"
)
private
String
nickName
;
@ApiModelProperty
(
"是否回复"
)
private
Integer
replyState
;
@ApiModelProperty
(
"是否删除"
)
private
Integer
isDelete
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
private
Date
createTime
;
...
...
pcloud-service-book/src/main/java/com/pcloud/book/applet/entity/BuyBookRequestReply.java
0 → 100644
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
entity
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.pcloud.common.entity.BaseEntity
;
import
lombok.Data
;
import
java.util.Date
;
@Data
public
class
BuyBookRequestReply
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
3897370077390347467L
;
private
Long
id
;
private
Long
requestId
;
private
String
replyMessage
;
private
Long
channelId
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
createTime
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
updateTime
;
}
pcloud-service-book/src/main/java/com/pcloud/book/applet/facade/BuyBookRequestFacade.java
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
facade
;
package
com
.
pcloud
.
book
.
applet
.
facade
;
import
com.pcloud.book.applet.biz.BuyBookRequestBiz
;
import
com.pcloud.book.applet.biz.BuyBookRequestBiz
;
import
com.pcloud.book.applet.dto.BuyBookRequestDTO
;
import
com.pcloud.book.applet.dto.BuyBookRequetUserDTO
;
import
com.pcloud.book.applet.dto.BuyBookRequetUserDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.book.applet.entity.BuyBookRequest
;
import
com.pcloud.book.base.exception.BookBizException
;
import
com.pcloud.book.base.exception.BookBizException
;
...
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -21,6 +22,7 @@ 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
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -39,8 +41,7 @@ public class BuyBookRequestFacade {
...
@@ -39,8 +41,7 @@ public class BuyBookRequestFacade {
@ApiOperation
(
"通过主键查询单条数据"
)
@ApiOperation
(
"通过主键查询单条数据"
)
@GetMapping
(
"getById"
)
@GetMapping
(
"getById"
)
public
ResponseDto
<?>
getById
(
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
Long
id
)
throws
BizException
,
PermissionException
{
public
ResponseDto
<?>
getById
(
@CookieValue
(
"userInfo"
)
String
userInfo
,
@RequestParam
Long
id
)
throws
BizException
,
PermissionException
{
SessionUtil
.
getToken4Redis
(
token
);
return
new
ResponseDto
<>(
buyBookRequestBiz
.
getById
(
id
));
return
new
ResponseDto
<>(
buyBookRequestBiz
.
getById
(
id
));
}
}
...
@@ -59,15 +60,17 @@ public class BuyBookRequestFacade {
...
@@ -59,15 +60,17 @@ public class BuyBookRequestFacade {
@PostMapping
(
"insert"
)
@PostMapping
(
"insert"
)
public
ResponseDto
<?>
insert
(
@CookieValue
(
"userInfo"
)
String
userInfo
,
@RequestBody
BuyBookRequest
buyBookRequest
)
public
ResponseDto
<?>
insert
(
@CookieValue
(
"userInfo"
)
String
userInfo
,
@RequestBody
BuyBookRequest
buyBookRequest
)
throws
BizException
,
PermissionException
{
throws
BizException
,
PermissionException
{
Long
miniWechatUserId
=
Cookie
.
getId
(
userInfo
,
"miniWechatUserId"
);
Long
officialAccountId
=
Cookie
.
getId
(
userInfo
,
Cookie
.
_OFFICIAL_ACCOUNTS_ID
);
Long
wechatUserId
=
Cookie
.
getId
(
userInfo
,
Cookie
.
_WECHAT_USER_ID
);
Long
wechatUserId
=
Cookie
.
getId
(
userInfo
,
Cookie
.
_WECHAT_USER_ID
);
buyBookRequest
.
setWechatUserId
(
wechatUserId
);
buyBookRequest
.
setWechatUserId
(
wechatUserId
);
return
new
ResponseDto
<>(
buyBookRequestBiz
.
insert
(
buyBookRequest
));
buyBookRequest
.
setMiniWechatUserId
(
miniWechatUserId
);
return
new
ResponseDto
<>(
buyBookRequestBiz
.
insert
(
buyBookRequest
,
officialAccountId
));
}
}
@ApiOperation
(
"更新"
)
@ApiOperation
(
"更新"
)
@PostMapping
(
"update"
)
@PostMapping
(
"update"
)
public
ResponseDto
<?>
update
(
@RequestHeader
(
"token"
)
String
token
,
@RequestBody
BuyBookRequest
buyBookRequest
)
throws
BizException
,
PermissionException
{
public
ResponseDto
<?>
update
(
@CookieValue
(
"userInfo"
)
String
userInfo
,
@RequestBody
BuyBookRequest
buyBookRequest
)
throws
BizException
,
PermissionException
{
SessionUtil
.
getToken4Redis
(
token
);
buyBookRequestBiz
.
update
(
buyBookRequest
);
buyBookRequestBiz
.
update
(
buyBookRequest
);
return
new
ResponseDto
<>();
return
new
ResponseDto
<>();
}
}
...
@@ -107,4 +110,42 @@ public class BuyBookRequestFacade {
...
@@ -107,4 +110,42 @@ public class BuyBookRequestFacade {
return
new
ResponseDto
<>();
return
new
ResponseDto
<>();
}
}
@ApiOperation
(
"获取不同回复状态购书申请记录"
)
@GetMapping
(
"getByState"
)
public
ResponseDto
<?>
getByState
(
@CookieValue
(
"userInfo"
)
String
userInfo
,
@RequestParam
(
value
=
"currentPage"
,
defaultValue
=
"0"
)
Integer
currentPage
,
@RequestParam
(
value
=
"numPerPage"
,
defaultValue
=
"10"
)
Integer
numPerPage
,
@RequestParam
(
value
=
"state"
,
required
=
false
)
Integer
state
,
@RequestParam
(
value
=
"requestEnv"
)
Integer
requestEvn
){
Long
wechatUserId
=
Cookie
.
getId
(
userInfo
,
Cookie
.
_WECHAT_USER_ID
);
return
new
ResponseDto
<>(
buyBookRequestBiz
.
getByState
(
currentPage
,
numPerPage
,
wechatUserId
,
state
,
requestEvn
));
}
@ApiOperation
(
"假删除数据"
)
@GetMapping
(
"fakeDelete"
)
public
ResponseDto
<?>
fakeDelete
(
@CookieValue
(
"userInfo"
)
String
userInfo
,
@RequestParam
(
"requestId"
)
Long
requestId
){
if
(
null
==
requestId
)
{
throw
BookBizException
.
PARAM_DELETION
;
}
buyBookRequestBiz
.
fakeDelete
(
requestId
);
return
new
ResponseDto
<>();
}
/**
* 处理数据
* @param token
* @param open 为 1 更新删除状态为未删除
* 和回复状态为未回复状态
* 为 0 不更新着两个状态
* @return
*/
@ApiOperation
(
"处理数据"
)
@GetMapping
(
"processingData"
)
public
ResponseDto
<?>
processingData
(
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
(
value
=
"open"
,
required
=
false
)
int
open
){
SessionUtil
.
getToken4Redis
(
token
);
buyBookRequestBiz
.
processingData
(
open
);
return
new
ResponseDto
<>();
}
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/applet/facade/BuyBookRequestReplyFacade.java
0 → 100644
View file @
557f4d40
package
com
.
pcloud
.
book
.
applet
.
facade
;
import
com.pcloud.book.applet.biz.BuyBookRequestReplyBiz
;
import
com.pcloud.book.applet.dto.BuyBookRequestReplyDTO
;
import
com.pcloud.book.applet.entity.BuyBookRequestReply
;
import
com.pcloud.common.dto.ResponseDto
;
import
com.pcloud.common.utils.SessionUtil
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
* (BuyBookRequestReply)表控制层
*
* @author dominic_z
* @since 2020年12月25日 16:25:37
*/
@RestController
(
"buyBookRequestReplyFacade"
)
@RequestMapping
(
"buyBookRequestReply"
)
public
class
BuyBookRequestReplyFacade
{
@Autowired
private
BuyBookRequestReplyBiz
buyBookRequestReplyBiz
;
@ApiOperation
(
"新增"
)
@PostMapping
(
"insert"
)
public
ResponseDto
<?>
insert
(
@RequestHeader
(
"token"
)
String
token
,
@RequestBody
()
BuyBookRequestReply
buyBookRequestReply
)
{
SessionUtil
.
getToken4Redis
(
token
);
return
new
ResponseDto
<>(
buyBookRequestReplyBiz
.
insert
(
buyBookRequestReply
));
}
@ApiOperation
(
"通过购书记录Id获取回复消息"
)
@GetMapping
(
"getByRequestId"
)
public
ResponseDto
<
List
<
BuyBookRequestReplyDTO
>>
getByRequestId
(
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
(
"requestId"
)
Long
requestId
)
{
SessionUtil
.
getToken4Redis
(
token
);
return
new
ResponseDto
<>(
buyBookRequestReplyBiz
.
getByRequestId
(
requestId
));
}
@ApiOperation
(
"删除回复记录"
)
@GetMapping
(
"deleteById"
)
public
ResponseDto
<?>
deleteById
(
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
(
"id"
)
Long
id
){
SessionUtil
.
getToken4Redis
(
token
);
buyBookRequestReplyBiz
.
deleteById
(
id
);
return
new
ResponseDto
<>();
}
}
pcloud-service-book/src/main/java/com/pcloud/book/consumer/reader/ReaderConsr.java
View file @
557f4d40
...
@@ -18,6 +18,7 @@ import com.pcloud.common.dto.ResponseDto;
...
@@ -18,6 +18,7 @@ import com.pcloud.common.dto.ResponseDto;
import
com.pcloud.common.utils.string.StringUtil
;
import
com.pcloud.common.utils.string.StringUtil
;
import
com.pcloud.readercenter.wechat.dto.SpecialBookDTO4Reader
;
import
com.pcloud.readercenter.wechat.dto.SpecialBookDTO4Reader
;
import
com.pcloud.readercenter.wechat.dto.SpecialBookQueryDTO4Reader
;
import
com.pcloud.readercenter.wechat.dto.SpecialBookQueryDTO4Reader
;
import
com.pcloud.readercenter.wechat.dto.BuyBookProcessingDataDTO
;
import
com.pcloud.readercenter.wechat.dto.Wechat
;
import
com.pcloud.readercenter.wechat.dto.Wechat
;
import
com.pcloud.usercenter.party.agent.dto.AgentCity
;
import
com.pcloud.usercenter.party.agent.dto.AgentCity
;
import
com.pcloud.usercenter.party.agent.service.AgentService
;
import
com.pcloud.usercenter.party.agent.service.AgentService
;
...
@@ -346,6 +347,20 @@ public class ReaderConsr {
...
@@ -346,6 +347,20 @@ public class ReaderConsr {
}
}
return
taskCount
;
return
taskCount
;
}
}
public
List
<
BuyBookProcessingDataDTO
>
getProcessingData
(
List
<
Long
>
idList
){
if
(
CollUtil
.
isEmpty
(
idList
)){
return
null
;
}
List
<
BuyBookProcessingDataDTO
>
result
=
new
ArrayList
<>();
try
{
ResponseEntity
<
ResponseDto
<
List
<
BuyBookProcessingDataDTO
>>>
sendUserRobotInfo
=
wechatUserService
.
getBuyBookProcessingData
(
idList
);
result
=
ResponseHandleUtil
.
parseList
(
sendUserRobotInfo
,
BuyBookProcessingDataDTO
.
class
);
}
catch
(
Exception
e
)
{
LOGGER
.
error
(
"获取处理数据失败:"
+
e
.
getMessage
(),
e
);
}
return
result
;
}
}
}
pcloud-service-book/src/main/resources/mapper/applet/BuyBookRequest.Mapper.xml
View file @
557f4d40
...
@@ -12,6 +12,11 @@
...
@@ -12,6 +12,11 @@
<result
column=
"user_name"
property=
"userName"
jdbcType=
"VARCHAR"
/>
<result
column=
"user_name"
property=
"userName"
jdbcType=
"VARCHAR"
/>
<result
column=
"phone"
property=
"phone"
jdbcType=
"VARCHAR"
/>
<result
column=
"phone"
property=
"phone"
jdbcType=
"VARCHAR"
/>
<result
column=
"address"
property=
"address"
jdbcType=
"VARCHAR"
/>
<result
column=
"address"
property=
"address"
jdbcType=
"VARCHAR"
/>
<result
column=
"mini_wechat_user_id"
property=
"miniWechatUserId"
jdbcType=
"BIGINT"
/>
<result
column=
"wechat_nick_name"
property=
"nickName"
jdbcType=
"VARCHAR"
/>
<result
column=
"mini_open_id"
property=
"miniOpenId"
jdbcType=
"VARCHAR"
/>
<result
column=
"reply_state"
property=
"replyState"
jdbcType=
"BIGINT"
/>
<result
column=
"is_delete"
property=
"isDelete"
jdbcType=
"BIGINT"
/>
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
</resultMap>
...
@@ -27,11 +32,16 @@
...
@@ -27,11 +32,16 @@
<result
column=
"user_name"
property=
"userName"
jdbcType=
"VARCHAR"
/>
<result
column=
"user_name"
property=
"userName"
jdbcType=
"VARCHAR"
/>
<result
column=
"phone"
property=
"phone"
jdbcType=
"VARCHAR"
/>
<result
column=
"phone"
property=
"phone"
jdbcType=
"VARCHAR"
/>
<result
column=
"address"
property=
"address"
jdbcType=
"VARCHAR"
/>
<result
column=
"address"
property=
"address"
jdbcType=
"VARCHAR"
/>
<result
column=
"mini_wechat_user_id"
property=
"miniWechatUserId"
jdbcType=
"BIGINT"
/>
<result
column=
"wechat_nick_name"
property=
"nickName"
jdbcType=
"VARCHAR"
/>
<result
column=
"mini_open_id"
property=
"miniOpenId"
jdbcType=
"VARCHAR"
/>
<result
column=
"reply_state"
property=
"replyState"
jdbcType=
"BIGINT"
/>
<result
column=
"is_delete"
property=
"isDelete"
jdbcType=
"BIGINT"
/>
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id, book_id, adviser_id, channel_id, agent_id, wechat_user_id, user_name, phone, address,
create_time, update_time
id, book_id, adviser_id, channel_id, agent_id, wechat_user_id, user_name, phone, address,
mini_wechat_user_id, wechat_nick_name, mini_open_id, reply_state, is_delete, create_time, update_time
</sql>
</sql>
<select
id=
"getById"
resultMap=
"BaseResultMap"
>
<select
id=
"getById"
resultMap=
"BaseResultMap"
>
...
@@ -49,6 +59,7 @@
...
@@ -49,6 +59,7 @@
<if
test=
"agentId != null"
>
<if
test=
"agentId != null"
>
agent_id = #{agentId}
agent_id = #{agentId}
</if>
</if>
and is_delete= #{isDelete}
</where>
</where>
order by create_time desc
order by create_time desc
</select>
</select>
...
@@ -62,7 +73,12 @@
...
@@ -62,7 +73,12 @@
wechat_user_id,
wechat_user_id,
user_name,
user_name,
phone,
phone,
address,
address,
mini_wechat_user_id,
wechat_nick_name,
mini_open_id,
reply_state,
is_delete,
create_time,
create_time,
update_time
update_time
) VALUES (
) VALUES (
...
@@ -73,7 +89,12 @@
...
@@ -73,7 +89,12 @@
#{wechatUserId, jdbcType=BIGINT},
#{wechatUserId, jdbcType=BIGINT},
#{userName, jdbcType=VARCHAR},
#{userName, jdbcType=VARCHAR},
#{phone, jdbcType=VARCHAR},
#{phone, jdbcType=VARCHAR},
#{address, jdbcType=VARCHAR},
#{address, jdbcType=VARCHAR},
#{miniWechatUserId, jdbcType=BIGINT},
#{nickName, jdbcType=VARCHAR},
#{miniOpenId, jdbcType=VARCHAR},
#{replyState, jdbcType=BIGINT},
#{isDelete, jdbcType=BIGINT},
now(),
now(),
now()
now()
)
)
...
@@ -89,6 +110,11 @@
...
@@ -89,6 +110,11 @@
user_name,
user_name,
phone,
phone,
address,
address,
mini_wechat_user_id,
wechat_nick_name,
mini_open_id,
reply_state,
is_delete,
create_time,
create_time,
update_time
update_time
) VALUES
) VALUES
...
@@ -102,6 +128,11 @@
...
@@ -102,6 +128,11 @@
#{item.userName, jdbcType=VARCHAR},
#{item.userName, jdbcType=VARCHAR},
#{item.phone, jdbcType=VARCHAR},
#{item.phone, jdbcType=VARCHAR},
#{item.address, jdbcType=VARCHAR},
#{item.address, jdbcType=VARCHAR},
#{miniWechatUserId, jdbcType=BIGINT},
#{nickName, jdbcType=VARCHAR},
#{miniOpenId, jdbcType=VARCHAR},
#{replyState, jdbcType=BIGINT},
#{isDelete, jdbcType=BIGINT},
#{item.createTime, jdbcType=TIMESTAMP},
#{item.createTime, jdbcType=TIMESTAMP},
#{item.updateTime, jdbcType=TIMESTAMP}
#{item.updateTime, jdbcType=TIMESTAMP}
)
)
...
@@ -136,6 +167,21 @@
...
@@ -136,6 +167,21 @@
<if
test=
"address != null and address != ''"
>
<if
test=
"address != null and address != ''"
>
address = #{address},
address = #{address},
</if>
</if>
<if
test=
"miniWechatUserId != null and miniWechatUserId != ''"
>
mini_wechat_user_id = #{miniWechatUserId},
</if>
<if
test=
"nickName != null and nickName != ''"
>
wechat_nick_name = #{nickName},
</if>
<if
test=
"miniOpenId != null and miniOpenId != ''"
>
mini_open_id = #{miniOpenId},
</if>
<if
test=
"replyState != null and replyState != ''"
>
reply_state = #{replyState},
</if>
<if
test=
"isDelete != null and isDelete != ''"
>
is_delete = #{isDelete},
</if>
<if
test=
"createTime != null"
>
<if
test=
"createTime != null"
>
create_time = #{createTime},
create_time = #{createTime},
</if>
</if>
...
@@ -161,4 +207,65 @@
...
@@ -161,4 +207,65 @@
create_time desc
create_time desc
</select>
</select>
<select
id=
"getRequestByWechatUserIdAndState"
resultMap=
"BaseResultMap4DTO"
parameterType=
"map"
>
select
<include
refid=
"Base_Column_List"
/>
from
buy_book_request
<where>
<if
test=
"wechatUserId != null"
>
wechat_user_id = #{wechatUserId, jdbcType=BIGINT}
</if>
<if
test=
"miniWechatUserId != null"
>
mini_wechat_user_id = #{miniWechatUserId, jdbcType=BIGINT}
</if>
<if
test=
"replyState != null "
>
And
reply_state = #{replyState, jdbcType=BIGINT}
</if>
And
is_delete = #{isDelete, jdbcType=BIGINT}
</where>
order by
create_time desc
</select>
<select
id=
"listIdsByWeChatUserId"
parameterType=
"long"
resultType=
"long"
>
select
id
from
buy_book_request
where
wechat_user_id = #{wechatUserId, jdbcType=BIGINT}
</select>
<select
id=
"listAllWeChatUserId"
resultType=
"long"
>
select
distinct wechat_user_id
FROM
buy_book_request
</select>
<update
id=
"update2ProcessingData"
parameterType=
"map"
>
update buy_book_request
<set>
<if
test=
"miniWechatUserId != null and miniWechatUserId != ''"
>
mini_wechat_user_id = #{miniWechatUserId},
</if>
<if
test=
"nickName != null and nickName != ''"
>
wechat_nick_name = #{nickName},
</if>
<if
test=
"miniOpenId != null and miniOpenId != ''"
>
mini_open_id = #{miniOpenId},
</if>
<if
test=
"replyState != null and replyState != ''"
>
reply_state = #{replyState},
</if>
<if
test=
"isDelete != null and isDelete != ''"
>
is_delete = #{isDelete},
</if>
</set>
where wechat_user_id = #{wechatUserId, jdbcType=BIGINT}
</update>
</mapper>
</mapper>
\ No newline at end of file
pcloud-service-book/src/main/resources/mapper/applet/BuyBookRequestReplyMapper.xml
0 → 100644
View file @
557f4d40
<?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.pcloud.book.applet.dao.impl.BuyBookRequestReplyDaoImpl"
>
<resultMap
id=
"BaseResultMap"
type=
"com.pcloud.book.applet.entity.BuyBookRequestReply"
>
<id
column=
"id"
property=
"id"
jdbcType=
"BIGINT"
/>
<result
column=
"request_id"
property=
"requestId"
jdbcType=
"BIGINT"
/>
<result
column=
"reply_message"
property=
"replyMessage"
jdbcType=
"VARCHAR"
/>
<result
column=
"channel_id"
property=
"channelId"
jdbcType=
"BIGINT"
/>
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
<resultMap
id=
"BaseResultMap4DTO"
type=
"com.pcloud.book.applet.dto.BuyBookRequestReplyDTO"
>
<id
column=
"id"
property=
"id"
jdbcType=
"BIGINT"
/>
<result
column=
"request_id"
property=
"requestId"
jdbcType=
"BIGINT"
/>
<result
column=
"reply_message"
property=
"replyMessage"
jdbcType=
"VARCHAR"
/>
<result
column=
"channel_id"
property=
"channelId"
jdbcType=
"BIGINT"
/>
<result
column=
"create_time"
property=
"createTime"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"update_time"
property=
"updateTime"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
<sql
id =
"Base_Column_List"
>
id, request_id, reply_message, channel_id, create_time, update_time
</sql>
<insert
id=
"insert"
keyProperty=
"id"
useGeneratedKeys=
"true"
>
INSERT INTO buy_book_request_reply(
request_id,
reply_message,
channel_id,
create_time,
update_time
) VALUES (
#{requestId, jdbcType=BIGINT},
#{replyMessage, jdbcType=VARCHAR},
#{channelId, jdbcType=BIGINT},
now(),
now()
)
</insert>
<select
id=
"getByRequestId"
resultMap=
"BaseResultMap4DTO"
parameterType=
"long"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM
buy_book_request_reply
where
request_id = #{requestId, jdbcType=BIGINT}
</select>
<delete
id=
"deleteById"
parameterType=
"long"
>
Delete
FROM
buy_book_request_reply
where
id=#{id, jdbcType=BIGINT}
</delete>
<!-- 批量获取回复信息 -->
<select
id=
"listBaseMapByIds"
resultMap=
"BaseResultMap4DTO"
parameterType=
"list"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM
buy_book_request_reply
WHERE
request_id IN
<foreach
collection=
"list"
index=
"i"
item=
"item"
open=
"("
separator=
","
close=
")"
>
${item}
</foreach>
</select>
</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