Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
supplier
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
王宇航
supplier
Commits
4155fd28
Commit
4155fd28
authored
Jun 04, 2020
by
Wyh
Committed by
宁斌
Jun 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
6.04 修改了支付
parent
c4925933
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletions
+3
-1
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
+1
-1
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OtherOrderActivity.kt
+1
-0
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt
+1
-0
No files found.
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
View file @
4155fd28
...
...
@@ -343,7 +343,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
// updateOrderStatus(data.Id.toString(), "", status, "", "", isPush, data.order_type).apply {
// listener.invoke(success)
// }
repository
.
gsUpdateOrderStatus
(
data
.
Id
.
toString
(),
status
,
data
.
order_type
,
1
,
""
,
""
,
""
,
"0"
,
""
,
1
,
0
).
apply
{
repository
.
gsUpdateOrderStatus
(
data
.
Id
.
toString
(),
status
,
data
.
order_type
,
3
,
""
,
""
,
""
,
"0"
,
""
,
1
,
0
).
apply
{
listener
.
invoke
(
code
==
"1"
)
}
},
{
...
...
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OtherOrderActivity.kt
View file @
4155fd28
...
...
@@ -271,6 +271,7 @@ class OtherOrderActivity : BaseActivity() {
bind
.
setOnPostCallBack
(
object
:
GetInfoUpdateService
.
PostCallBack
{
override
fun
callBack
(
type
:
Int
)
{
//-1斷開連接,\n-2:消息傳輸錯誤,\n0:連接消息,\n1:登錄通知,\n2:登出通知,\n3:外賣送單通知,\n4:自取送單通知,\n5:歷史訂單通知,\n6:修改訂單狀態通知,\n7:支付成功通知"
Log
.
e
(
"message"
,
"消息類型$type"
)
if
(
type
==
3
||
type
==
4
||
type
==
5
||
type
==
6
||
type
==
7
)
{
if
(
type
==
6
||
type
==
7
)
{
...
...
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt
View file @
4155fd28
...
...
@@ -46,6 +46,7 @@ class PlaceholderFragment : BaseFragment() {
// page = 1
// getOrderList(this, false)
// }
Log
.
e
(
"eee"
,
"$it 當前:"
+
arguments
?.
getInt
(
INDEX
))
if
(
arguments
?.
getInt
(
INDEX
)
==
it
)
{
page
=
1
getOrderList
(
this
,
false
)
...
...
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