Toggle navigation
Toggle navigation
This project
Loading...
Sign in
wangshusheng
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to dashboard
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
hf
9 years ago
Commit
7240efb6b6ecfd8ce1b0927c3af26773c3060885
1 parent
ce551811
do fixes bug to home order bugs
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
library/LibModels/Wap/Passport/RegData.php
library/Plugin/Helpers.php
yohobuy/m.yohobuy.com/application/models/Home/Order.php
library/LibModels/Wap/Passport/RegData.php
View file @
7240efb
...
...
@@ -165,7 +165,7 @@ class RegData
$param
[
'password'
]
=
$password
;
$param
[
'client_secret'
]
=
Sign
::
getSign
(
$param
);
return
Yohobuy
::
post
(
Yohobuy
::
API_URL
,
$param
);
return
Yohobuy
::
post
(
Yohobuy
::
API_URL
,
$param
,
true
);
}
}
...
...
library/Plugin/Helpers.php
View file @
7240efb
...
...
@@ -508,6 +508,9 @@ class Helpers
}
elseif
(
$vo
[
'goods_type'
]
==
'price_gift'
)
{
$arr
[
$key
][
'advanceBuy'
]
=
true
;
}
if
(
!
empty
(
$vo
[
'expect_arrival_time'
]))
{
$arr
[
$key
][
'appearDate'
]
=
$vo
[
'expect_arrival_time'
];
}
}
return
$arr
;
}
...
...
yohobuy/m.yohobuy.com/application/models/Home/Order.php
View file @
7240efb
...
...
@@ -23,7 +23,7 @@ class OrderModel
{
$result
=
array
();
//调用接口获得数据
$data
=
OrderData
::
getOrderData
(
$type
,
$page
,
$limit
,
$gender
,
$yh_channel
,
5772257
);
var_dump
(
$data
);
exit
;
$data
=
OrderData
::
getOrderData
(
$type
,
$page
,
$limit
,
$gender
,
$yh_channel
,
7394907
)
;
// 判断是否还有数据, 没有数据则返回空
if
(
isset
(
$data
[
'data'
][
'page_total'
])
&&
$page
>
$data
[
'data'
][
'page_total'
])
{
return
$result
;
...
...
@@ -38,6 +38,7 @@ class OrderModel
$result
[
$key
][
'sumCost'
]
=
$vo
[
'amount'
];
//类内调用格式化订单商品数据方法
$result
[
$key
][
'goods'
]
=
Helpers
::
formatOrderGoods
(
$vo
[
'order_goods'
]);
$result
[
$key
][
'detailUrl'
]
=
Helpers
::
url
(
'/home/orders/detail'
,
array
(
'order_code'
=>
$vo
[
'order_code'
],
't'
=>
time
()));
//根据订单status判断订单处于什么状态。
do
{
//订单取消状态 = Y 时,跳出判断订单状态循环,并设置订单状态为已取消。
...
...
@@ -51,7 +52,7 @@ class OrderModel
//支付方式为非货到付款时,计算订单状态。
if
(
$vo
[
'payment_type'
]
!=
2
)
{
switch
(
$vo
[
'status'
])
{
case
0
:
case
0
:
// 备货中
$result
[
$key
][
'unpaid'
]
=
true
;
break
;
//未发货&未收货 状态,统一合并到待收货状态。
...
...
@@ -78,7 +79,8 @@ class OrderModel
//订单为货到付款订单时,计算订单状态。(货到付款没有待付款状态)
switch
(
$vo
[
'status'
])
{
case
0
:
case
0
:
break
;
case
1
:
case
2
:
case
3
:
...
...
Please
register
or
login
to post a comment