Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SiEn
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
hewei
SiEn
Commits
40276b79
Commit
40276b79
authored
Nov 09, 2020
by
lpx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
# 商家端行程报价和完成行程后给APP用户推送信息
parent
892fa91b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
0 deletions
+23
-0
api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java
+23
-0
No files found.
api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java
View file @
40276b79
...
@@ -4,12 +4,16 @@ import com.jumeirah.api.merchant.entity.param.StrokeCompleteParam;
...
@@ -4,12 +4,16 @@ import com.jumeirah.api.merchant.entity.param.StrokeCompleteParam;
import
com.jumeirah.api.merchant.entity.param.StrokeConfirmPaymentParam
;
import
com.jumeirah.api.merchant.entity.param.StrokeConfirmPaymentParam
;
import
com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam
;
import
com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam
;
import
com.jumeirah.api.merchant.entity.param.StrokeQuotedPriceParam
;
import
com.jumeirah.api.merchant.entity.param.StrokeQuotedPriceParam
;
import
com.jumeirah.common.entity.AppUser
;
import
com.jumeirah.common.entity.Stroke
;
import
com.jumeirah.common.entity.Stroke
;
import
com.jumeirah.common.enums.StatePaymentStatusEnum
;
import
com.jumeirah.common.enums.StatePaymentStatusEnum
;
import
com.jumeirah.common.enums.StrokeStatusEnum
;
import
com.jumeirah.common.enums.StrokeStatusEnum
;
import
com.jumeirah.common.factory.PushFactory
;
import
com.jumeirah.common.param.McStrokePageParam
;
import
com.jumeirah.common.param.McStrokePageParam
;
import
com.jumeirah.common.service.AppUserService
;
import
com.jumeirah.common.service.StrokeService
;
import
com.jumeirah.common.service.StrokeService
;
import
com.jumeirah.common.vo.McStrokeQueryVo
;
import
com.jumeirah.common.vo.McStrokeQueryVo
;
import
com.jumeirah.common.vo.StrokeDetailVo
;
import
io.geekidea.springbootplus.framework.common.api.ApiResult
;
import
io.geekidea.springbootplus.framework.common.api.ApiResult
;
import
io.geekidea.springbootplus.framework.common.controller.BaseController
;
import
io.geekidea.springbootplus.framework.common.controller.BaseController
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
import
io.geekidea.springbootplus.framework.core.pagination.Paging
;
...
@@ -43,6 +47,10 @@ public class McStrokeController extends BaseController {
...
@@ -43,6 +47,10 @@ public class McStrokeController extends BaseController {
@Autowired
@Autowired
private
StrokeService
strokeService
;
private
StrokeService
strokeService
;
@Autowired
private
PushFactory
pushFactory
;
@Autowired
private
AppUserService
appUserService
;
/**
/**
* 完成行程接口
* 完成行程接口
...
@@ -57,10 +65,24 @@ public class McStrokeController extends BaseController {
...
@@ -57,10 +65,24 @@ public class McStrokeController extends BaseController {
.
setUpdateTime
(
new
Timestamp
(
System
.
currentTimeMillis
()))
.
setUpdateTime
(
new
Timestamp
(
System
.
currentTimeMillis
()))
.
setStatus
(
StrokeStatusEnum
.
COMPLETED
.
getCode
());
.
setStatus
(
StrokeStatusEnum
.
COMPLETED
.
getCode
());
boolean
flag
=
strokeService
.
updateStroke
(
stroke
);
boolean
flag
=
strokeService
.
updateStroke
(
stroke
);
sendAppMsg
(
strokeCompleteParam
.
getId
(),
"3"
,
"您的订单已完成"
);
return
ApiResult
.
result
(
flag
);
return
ApiResult
.
result
(
flag
);
}
}
/**
/**
* 发送推送信息给APP端
* @param id
* @param pushType
* @param title
* @throws Exception
*/
private
void
sendAppMsg
(
Long
id
,
String
pushType
,
String
title
)
throws
Exception
{
StrokeDetailVo
newStroke
=
strokeService
.
getStrokeById
(
id
);
AppUser
appUser
=
appUserService
.
getById
(
newStroke
.
getUserId
());
pushFactory
.
getService
(
appUser
.
getDeviceType
()).
unicast
(
appUser
.
getDeviceToken
(),
pushType
,
title
);
}
/**
* 行程表分页列表
* 行程表分页列表
*/
*/
@PostMapping
(
"/getPageList"
)
@PostMapping
(
"/getPageList"
)
...
@@ -84,6 +106,7 @@ public class McStrokeController extends BaseController {
...
@@ -84,6 +106,7 @@ public class McStrokeController extends BaseController {
BeanUtils
.
copyProperties
(
strokeQuotedPriceParam
,
stroke
);
BeanUtils
.
copyProperties
(
strokeQuotedPriceParam
,
stroke
);
stroke
.
setUpdateTime
(
new
Timestamp
(
System
.
currentTimeMillis
()));
stroke
.
setUpdateTime
(
new
Timestamp
(
System
.
currentTimeMillis
()));
boolean
flag
=
strokeService
.
updateStroke
(
stroke
);
boolean
flag
=
strokeService
.
updateStroke
(
stroke
);
sendAppMsg
(
strokeQuotedPriceParam
.
getId
(),
"2"
,
"您的订单已报价"
);
return
ApiResult
.
result
(
flag
);
return
ApiResult
.
result
(
flag
);
}
}
...
...
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