Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
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
chenchuanwen
my-yaf-project
Commits
4543a86e
Commit
4543a86e
authored
Dec 06, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
goods
parent
c910b4ed
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
273 additions
and
176 deletions
+273
-176
OrderConst.php
application/library/Our/OrderConst.php
+11
-1
RefundService.php
application/models/Business/Order/RefundService.php
+8
-1
Goods.php
application/models/DAO/Goods.php
+8
-0
RefundReturn.php
application/models/DAO/Order/RefundReturn.php
+246
-174
No files found.
application/library/Our/OrderConst.php
View file @
4543a86e
...
...
@@ -25,6 +25,9 @@ class OrderConst {
const
express
=
'快递配送'
;
const
complete
=
"已完成"
;
const
close
=
"已关闭"
;
const
platformStateVerify
=
'待审核'
;
const
platformStateAgree
=
'同意'
;
const
platformStateRefuse
=
'拒绝'
;
const
platformAudit
=
"平台审核"
;
const
platFormAgree
=
"平台同意"
;
...
...
@@ -50,7 +53,14 @@ class OrderConst {
//详情
const
unpayDetailMessage
=
"10分钟后交易自动关闭"
;
const
payCancelDetailMessage
=
"10分钟可取消订单"
;
//商家售后状态
const
sellerStateVerify
=
'待审核'
;
const
sellerStateAgree
=
'同意'
;
const
sellerStateRefuse
=
'不同意'
;
//商家售后状态
const
platStateVerify
=
'待审核'
;
const
platStateAgree
=
'同意'
;
const
platStateRefuse
=
'不同意'
;
//店铺详细文案
const
storeWaiteConfirm
=
'请尽快确认订单'
;
const
storeWaiteSend
=
'请尽快发货'
;
...
...
application/models/Business/Order/RefundService.php
View file @
4543a86e
...
...
@@ -702,6 +702,7 @@ class RefundServiceModel extends \Business\AbstractModel
$orderCommons
=
$orderCommonDao
->
getAllByOrderIds
(
$orderIds
,
$orderCommonDao
->
orderCommonField
);
$orderCommons
=
$orderDao
->
convertOrder
(
$orderCommons
,
'orderId'
);
foreach
(
$refundMerge
as
&
$value
)
{
$value
[
'sellerStateName'
]
=
$refundReturnDao
->
getSellerStateName
(
$value
[
'sellerState'
]);
$value
[
'stateName'
]
=
$refundReturnDao
->
getRefundTextStatus
(
$value
,
true
);
/*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero;
$value['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero;
...
...
@@ -725,7 +726,13 @@ class RefundServiceModel extends \Business\AbstractModel
}
else
{
$value
[
'deliveryman'
]
=
new
\stdClass
();
}
$value
[
'goodsGroup'
]
=!
empty
(
$goodGroup
)
?
$goodGroup
:
[];
if
(
!
empty
(
$goodGroup
)){
$value
[
'goodsGroup'
]
=
$goodGroup
;
}
else
{
$value
[
'goodsGroup'
]
=
[];
$value
[
'goodsOriginPrice'
]
=
$goodsDao
->
getOriginPriceByGoodsGroup
(
$value
[
'goodsGroup'
]);
}
if
(
$value
[
'refundType'
]
==
ApiConst
::
refundTypeGoods
)
{
if
(
$value
[
'refundShippingType'
]
==
ApiConst
::
bySeller
){
$value
[
'reciverInfo'
]
=
$orderCommonDao
->
getReciverInfo
(
$value
[
'reciverInfo'
]);
...
...
application/models/DAO/Goods.php
View file @
4543a86e
...
...
@@ -474,6 +474,14 @@ class GoodsModel extends \DAO\AbstractModel {
}
return
$orderGoodses
;
}
public
function
getOriginPriceByGoodsGroup
(
$goodsGroup
){
$goodsOriginPrice
=
ApiConst
::
zero
;
foreach
(
$goodsGroup
as
$goodsG
){
$goodsOriginPrice
+=
$goodsG
[
'num'
]
*
$goodsG
[
'goodsPrice'
];
}
return
$goodsOriginPrice
;
}
//ccw
public
function
convert
(
$goodses
,
$extentField
=
false
,
$refundOrders
=
false
){
if
(
$refundOrders
){
...
...
application/models/DAO/Order/RefundReturn.php
View file @
4543a86e
This diff is collapsed.
Click to expand it.
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