Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
ae35e3cf
Commit
ae35e3cf
authored
Feb 14, 2022
by
xiangkun.gu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增暴露订单接口:查询支付成功超时接口,支付成功发送消息接口
parent
86339926
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
152 additions
and
4 deletions
+152
-4
order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java
+50
-4
order-application-service/src/main/java/cn/freemud/entities/vo/GenerateTackCodeVo.java
+17
-0
order-application-service/src/main/java/cn/freemud/entities/vo/GetPaySuccessTimeoutVo.java
+14
-0
order-application-service/src/main/java/cn/freemud/entities/vo/SendPaySuccessMessageVo.java
+39
-0
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
+8
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+24
-0
No files found.
order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java
View file @
ae35e3cf
package
cn
.
freemud
.
controller
;
package
cn
.
freemud
.
controller
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.vo.GetPayCodeByChanelVo
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.GetPayConfigVo
;
import
cn.freemud.enums.OrderTackCodeFactory
;
import
cn.freemud.entities.vo.GetPayTimeoutVo
;
import
cn.freemud.manager.OrderTackCodeManager
;
import
cn.freemud.entities.vo.PutDeadLetterVo
;
import
cn.freemud.service.business.OrderBusinessService
;
import
cn.freemud.service.business.impl.OrderBusinessServiceImpl
;
import
cn.freemud.service.impl.OrderServiceImpl
;
import
cn.freemud.service.impl.PayServiceImpl
;
import
cn.freemud.service.impl.PayServiceImpl
;
import
cn.freemud.utils.ResponseUtil
;
import
cn.freemud.utils.ResponseUtil
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
...
@@ -22,6 +24,14 @@ public class ExposureOrderController {
...
@@ -22,6 +24,14 @@ public class ExposureOrderController {
@Autowired
@Autowired
private
PayServiceImpl
payService
;
private
PayServiceImpl
payService
;
@Autowired
private
OrderTackCodeManager
orderTackCodeManager
;
@Autowired
private
OrderBusinessServiceImpl
orderBusinessService
;
@Autowired
private
OrderServiceImpl
orderService
;
/**
/**
* 创建支付单,查询支付配置
* 创建支付单,查询支付配置
...
@@ -64,4 +74,40 @@ public class ExposureOrderController {
...
@@ -64,4 +74,40 @@ public class ExposureOrderController {
return
ResponseUtil
.
success
();
return
ResponseUtil
.
success
();
}
}
/**
* 生成取餐码
*/
@ApiAnnotation
(
logMessage
=
"生成取餐码"
)
@PostMapping
(
"/generateTackCode"
)
public
BaseResponse
<
String
>
generateTackCode
(
@Validated
@LogParams
@RequestBody
GenerateTackCodeVo
generateTackCodeVo
)
{
String
tackCode
=
orderTackCodeManager
.
generateTackCode
(
generateTackCodeVo
.
getOrderType
(),
generateTackCodeVo
.
getPartnerId
(),
generateTackCodeVo
.
getStoreId
(),
null
,
OrderTackCodeFactory
.
getByOrderClient
(
generateTackCodeVo
.
getOrderClient
()).
getGenerateTackCodeFunc
());
return
ResponseUtil
.
success
(
tackCode
);
}
/**
* 从支付成功开始计时,超时未接单的时间(单位:分钟)
*/
@ApiAnnotation
(
logMessage
=
"获取超时时间"
)
@PostMapping
(
"/paySuccessTimeout"
)
public
BaseResponse
<
Integer
>
generateTackCode
(
@Validated
@LogParams
@RequestBody
GetPaySuccessTimeoutVo
getPaySuccessTimeoutVo
)
{
Integer
tackCode
=
orderBusinessService
.
getPaySuccessTimeout
(
getPaySuccessTimeoutVo
.
getPartnerId
(),
getPaySuccessTimeoutVo
.
getStoreId
(),
getPaySuccessTimeoutVo
.
getOrderType
());
return
ResponseUtil
.
success
(
tackCode
);
}
/**
* 发送支付成功模板消息
*/
@ApiAnnotation
(
logMessage
=
"发送支付成功模板消息"
)
@PostMapping
(
"/sendPayTemplateMessage"
)
public
BaseResponse
sendPayTemplateMessage
(
@Validated
@LogParams
@RequestBody
SendPaySuccessMessageVo
sendPaySuccessMessageVo
)
{
orderService
.
sendMessageByNewApp
(
sendPaySuccessMessageVo
);
return
ResponseUtil
.
success
();
}
}
}
order-application-service/src/main/java/cn/freemud/entities/vo/GenerateTackCodeVo.java
0 → 100644
View file @
ae35e3cf
package
cn
.
freemud
.
entities
.
vo
;
import
lombok.Data
;
@Data
public
class
GenerateTackCodeVo
{
private
Integer
orderType
;
private
String
orderClient
;
private
String
partnerId
;
private
String
storeId
;
}
order-application-service/src/main/java/cn/freemud/entities/vo/GetPaySuccessTimeoutVo.java
0 → 100644
View file @
ae35e3cf
package
cn
.
freemud
.
entities
.
vo
;
import
lombok.Data
;
@Data
public
class
GetPaySuccessTimeoutVo
{
private
Integer
orderType
;
private
String
partnerId
;
private
String
storeId
;
}
order-application-service/src/main/java/cn/freemud/entities/vo/SendPaySuccessMessageVo.java
0 → 100644
View file @
ae35e3cf
package
cn
.
freemud
.
entities
.
vo
;
import
lombok.Data
;
@Data
public
class
SendPaySuccessMessageVo
{
private
String
partnerId
;
private
String
address
;
private
String
storeName
;
private
String
orderCode
;
private
Integer
orderType
;
private
String
otherCode
;
private
String
extInfo
;
private
Long
amount
;
/**
* 期望送达时间
*/
private
Long
gmtExpect
;
/**
* 创建时间 时间戳
*/
private
Long
gmtCreate
;
/**
* 日订单序号
*/
private
Integer
daySeq
;
}
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
View file @
ae35e3cf
...
@@ -569,4 +569,12 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
...
@@ -569,4 +569,12 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
return
userScoreRequest
;
return
userScoreRequest
;
}
}
public
Integer
getPaySuccessTimeout
(
String
partnerId
,
String
storeId
,
Integer
orderType
)
{
ConfirmOrderRequest
confirmOrderRequest
=
new
ConfirmOrderRequest
();
confirmOrderRequest
.
setPartnerId
(
partnerId
);
confirmOrderRequest
.
setStoreId
(
storeId
);
confirmOrderRequest
.
setOrderType
(
orderType
);
return
this
.
getPaySuccessTimeout
(
confirmOrderRequest
,
null
);
}
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
ae35e3cf
...
@@ -3752,4 +3752,28 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -3752,4 +3752,28 @@ public class OrderServiceImpl implements Orderservice {
return
ResponseUtil
.
success
(
userLoginInfoDto
);
return
ResponseUtil
.
success
(
userLoginInfoDto
);
}
}
/**
* 发送支付成功模板消息
*
*/
public
void
sendMessageByNewApp
(
SendPaySuccessMessageVo
sendPaySuccessMessageVo
)
{
OrderBeanV1
orderBean
=
new
OrderBeanV1
();
orderBean
.
setCompanyId
(
sendPaySuccessMessageVo
.
getPartnerId
());
orderBean
.
setAddress
(
sendPaySuccessMessageVo
.
getAddress
());
orderBean
.
setDaySeq
(
sendPaySuccessMessageVo
.
getDaySeq
());
orderBean
.
setGmtExpect
(
sendPaySuccessMessageVo
.
getGmtExpect
());
orderBean
.
setShopName
(
sendPaySuccessMessageVo
.
getStoreName
());
orderBean
.
setGmtCreate
(
sendPaySuccessMessageVo
.
getGmtCreate
());
orderBean
.
setOid
(
sendPaySuccessMessageVo
.
getOrderCode
());
orderBean
.
setOrderType
(
sendPaySuccessMessageVo
.
getOrderType
());
orderBean
.
setOtherCode
(
sendPaySuccessMessageVo
.
getOtherCode
());
orderBean
.
setAmount
(
sendPaySuccessMessageVo
.
getAmount
());
OrderExtInfoDto
extInfoDto
=
JSON
.
parseObject
(
sendPaySuccessMessageVo
.
getExtInfo
(),
OrderExtInfoDto
.
class
);
extInfoDto
.
setAppid
(
extInfoDto
.
getAppid
());
extInfoDto
.
setOpenid
(
extInfoDto
.
getOpenid
());
extInfoDto
.
setPrepayId
(
extInfoDto
.
getPrepayId
());
orderBean
.
setExtInfo
(
JSON
.
toJSONString
(
extInfoDto
));
this
.
sendPaySuccessMessage
(
orderBean
);
}
}
}
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