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
64b9a8c4
Commit
64b9a8c4
authored
Sep 25, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
storeMemberId
parent
f1669566
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
OrderService.php
application/models/Business/Order/OrderService.php
+3
-3
RefundService.php
application/models/Business/Order/RefundService.php
+7
-4
Store.php
application/models/DAO/Store.php
+1
-0
No files found.
application/models/Business/Order/OrderService.php
View file @
64b9a8c4
...
...
@@ -254,9 +254,9 @@ class OrderServiceModel extends \Business\AbstractModel
$this
->
orderGoodsList
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderId
,
$this
->
getGoodsDetailField
()),
\Our\ApiConst
::
oneDaySecond
,
array
(
$orderId
));
//商店相关信息
$this
->
store
=
$storeDao
->
get
(
$this
->
order
[
'storeId'
]);
$this
->
store
=
Common
::
convertUnderline
(
$this
->
store
[
0
]);
// $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'], $this->storeField), \Our\ApiConst::one
DaySecond,array($this->order['storeId']));
//
$this->store=$storeDao->get($this->order['storeId']);
//
$this->store=Common::convertUnderline($this->store[0]);
$this
->
store
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$this
->
order
[
'storeId'
],
$storeDao
->
detailField
),
\Our\ApiConst
::
seven
DaySecond
,
array
(
$this
->
order
[
'storeId'
]));
$returnData
=
$this
->
order
;
//配送员信息
$this
->
diliveryman
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$diliverymanDao
,
'findById'
),
array
(
$returnData
[
'diliverymanId'
]),
\Our\ApiConst
::
oneDaySecond
);
...
...
application/models/Business/Order/RefundService.php
View file @
64b9a8c4
...
...
@@ -235,8 +235,9 @@ class RefundServiceModel extends \Business\AbstractModel
$orderGoodses
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\RefundReasonRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderInfo
[
'orderId'
],
$this
->
orderGoodsField
),
\Our\ApiConst
::
oneDaySecond
);
$orderGoodses
=
$orderGoodsDao
->
convertOrderGoods
(
$orderGoodses
,
'goodsId'
);
$goodsIds
=
$orderGoodsDao
->
getRefundOrderGoodsIds
(
$orderGoodses
);
$this
->
store
=
$storeDao
->
get
(
$this
->
order
[
'storeId'
]);
$this
->
store
=
Common
::
convertUnderline
(
$this
->
store
[
0
]);
// $this->store=$storeDao->get($this->order['storeId']);
// $this->store=Common::convertUnderline($this->store[0]);
$this
->
store
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$orderInfo
[
'storeId'
],
$storeDao
->
detailField
),
\Our\ApiConst
::
sevenDaySecond
,
array
(
$orderInfo
[
'storeId'
]));
if
(
!
empty
(
$orderGoodses
[
$goodsId
])){
$orderGoods
=
$orderGoodses
[
$goodsId
];
}
...
...
@@ -443,8 +444,10 @@ class RefundServiceModel extends \Business\AbstractModel
ErrorModel
::
throwException
(
CodeConfigModel
::
notExistRefund
);
}
$orderGoods
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\RefundReasonRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'findByRecId'
),
array
(
$refundReturn
[
'orderGoodsId'
],
$this
->
getGoodsDetailField
()),
\Our\ApiConst
::
oneDaySecond
);
$this
->
store
=
$storeDao
->
get
(
$refundReturn
[
'storeId'
]);
$this
->
store
=
Common
::
convertUnderline
(
$this
->
store
[
0
]);
// $this->store=$storeDao->get($refundReturn['storeId']);
// $this->store=Common::convertUnderline($this->store[0]);
$this
->
store
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$refundReturn
[
'storeId'
],
$storeDao
->
detailField
),
\Our\ApiConst
::
sevenDaySecond
,
array
(
$refundReturn
[
'storeId'
]));
$refundReturn
[
'goodsGroup'
]
=
$goodsDao
->
getGoodsGroup
(
$orderGoods
[
'goodsGroup'
]);
$refundReturn
[
'goodsAttr'
]
=
$goodsDao
->
getFormatGoodsAttr
(
$orderGoods
[
'goodsSpec'
]);
$refundReturn
[
'sellerStateName'
]
=
ArrayConst
::
sellerState
[
$refundReturn
[
'sellerState'
]];
...
...
application/models/DAO/Store.php
100755 → 100644
View file @
64b9a8c4
...
...
@@ -13,6 +13,7 @@ use Our\ImageConst;
class
StoreModel
extends
\DAO\AbstractModel
{
public
$detailField
=
" member_id as memberId,store_id as storeId,offline_payway as offlinePayway"
;
protected
function
init
()
{
...
...
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