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
3274b5a0
Commit
3274b5a0
authored
Dec 11, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alertStrage
parent
26b48707
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
DescribeConst.php
application/library/Our/DescribeConst.php
+1
-0
GoodsCommonService.php
application/models/Business/Goods/GoodsCommonService.php
+1
-1
RefundService.php
application/models/Business/Order/RefundService.php
+5
-2
No files found.
application/library/Our/DescribeConst.php
View file @
3274b5a0
...
...
@@ -154,6 +154,7 @@ class DescribeConst
const
notPayed
=
'未付款'
;
//货到付款
const
refund
=
'退款'
;
const
refundRetund
=
'退货'
;
const
refundSuccess
=
'退款成功'
;
const
sellerRefuseReturn
=
'卖家拒绝退货'
;
const
sellerAgreeReturn
=
'卖家同意退货'
;
...
...
application/models/Business/Goods/GoodsCommonService.php
View file @
3274b5a0
...
...
@@ -10,7 +10,7 @@ use Zend\Json\Server\Exception\ErrorException;
class
GoodsCommonServiceModel
extends
\Business\AbstractModel
{
private
$goodsStorageField
=
'goods_id goodsId,goods_name goodsName,goods_verify goodsVerify,goods_state goodsState,goods_image goodsImage,goods_price goodsPrice,goods_storage goodsStorage,goods_spec goodsAttr'
;
private
$goodsStorageField
=
'goods_id goodsId,goods_name goodsName,goods_verify goodsVerify,goods_state goodsState,goods_image goodsImage,goods_price goodsPrice,goods_storage goodsStorage,goods_spec goodsAttr
,goods_storage_alarm as goodsStorageAlarm
'
;
private
$setStorageType
=
array
(
'add'
=>
1
,
'set'
=>
2
);
public
function
init
()
{
...
...
application/models/Business/Order/RefundService.php
View file @
3274b5a0
...
...
@@ -216,14 +216,17 @@ class RefundServiceModel extends \Business\AbstractModel
$refundReturnDao
=
\DAO\Order\RefundReturnModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$returnDetail
=
$refundReturnDao
->
findByRefundId
(
$refundId
,
$refundReturnDao
->
refundDetailField
);
$storeDao
=
\DAO\StoreModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
//$orderGoodsDao=\DAO\Order\RefundReturn
Model::getInstance();
$orderGoodsDao
=
\DAO\Order\OrderGoods
Model
::
getInstance
();
if
(
$returnDetail
[
'storeId'
]
!=
$storeId
){
ErrorModel
::
throwException
(
CodeConfigModel
::
notExistRefund
);
}
$updateData
=
array
();
$updateData
[
'is_suc_refund'
]
=
ApiConst
::
refundSuccess
;
$updateData
[
'refund_state'
]
=
ApiConst
::
refundStateComplete
;
$res
=
$refundReturnDao
->
update
(
array
(
'refund_id'
=>
$refundId
),
$updateData
);
$goodsUpdateData
[
'is_refund'
]
=
ApiConst
::
refundSuccess
;
$goodsUpdateData
[
'refund_state_name'
]
=
DescribeConst
::
refundSuccess
;
$orderGoodsWhere
[
'rec_id'
]
=
$returnDetail
[
'orderGoodsId'
];
$orderGoodsDao
->
update
(
$orderGoodsWhere
,
$goodsUpdateData
);
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$refundReturnDao
,
'getList'
),
array
(),
array
(
$refundId
));
$storeDao
->
deleteStoreCache
(
$storeId
,
$refundId
);
$storeDao
->
deleteStoreRefundCache
(
$storeId
,
$refundId
);
...
...
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