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
d2577346
Commit
d2577346
authored
Sep 06, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
orderEdit
parent
135215d9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
OrderService.php
application/models/Business/Order/OrderService.php
+3
-3
Order.php
application/models/DAO/Order/Order.php
+5
-2
No files found.
application/models/Business/Order/OrderService.php
View file @
d2577346
...
...
@@ -215,7 +215,7 @@ class OrderServiceModel extends \Business\AbstractModel
$storeDao
=
\DAO\StoreModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$goodsDao
=
\DAO\GoodsModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
//订单
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
);
$order
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'findByOrderId'
),
array
(
$orderId
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$orderId
)
);
$fields
=
$orderDao
->
getFields
();
$this
->
order
=
$orderDao
->
getConvertOrder
(
$order
,
$fields
);
//收货人地址
...
...
@@ -714,14 +714,14 @@ class OrderServiceModel extends \Business\AbstractModel
$where
[
'lock_state'
]
=
ApiConst
::
zero
;
//获得订单列表
$orders
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'getList'
),
array
(
$where
,
$this
->
orderField
,
$pageIndex
,
$pageSize
,
$order
=
array
(
'add_time'
=>
'desc'
)),
\Our\ApiConst
::
oneDaySecond
,
array
(
$
member
Id
));
$orders
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'getList'
),
array
(
$where
,
$this
->
orderField
,
$pageIndex
,
$pageSize
,
$order
=
array
(
'add_time'
=>
'desc'
)),
\Our\ApiConst
::
oneDaySecond
,
array
(
$
diliveryman
Id
));
$goodsDao
=
\DAO\GoodsModel
::
getInstance
();
$orderIds
=
array_column
(
$orders
[
'list'
],
'orderId'
);
$orderCommons
=
$orderCommonDao
->
getAllByOrderIdsCache
(
$orderIds
,
$diliverymanId
,
$orderCommonDao
->
orderCommonField
);
//获得订单商品列表
if
(
!
empty
(
$orderIds
))
{
$orderGoods
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderIds
,
$this
->
orderGoodsField
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$
member
Id
));
$orderGoods
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderIds
,
$this
->
orderGoodsField
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$
diliveryman
Id
));
$orderMerge
=
Common
::
intergrateOneToMany
(
$orders
[
'list'
],
$orderGoods
,
'orderId'
,
'orderId'
,
'orderGoods'
);
$orderMerge
=
Common
::
intergrateOneToOne
(
$orderMerge
,
$orderCommons
,
'orderId'
,
'orderId'
);
$orderMerge
=
$orderDao
->
convertOrderList
(
$orderMerge
);
...
...
application/models/DAO/Order/Order.php
View file @
d2577346
...
...
@@ -769,7 +769,7 @@ class OrderModel extends \DAO\AbstractModel
//删除订单详情缓存
public
function
deleteFindByOrderIdCache
(
$orderId
)
{
return
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$this
,
'findByOrderId'
),
array
(
$orderId
));
return
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$this
,
'findByOrderId'
),
array
(
$orderId
)
,
array
(
$orderId
)
);
}
//删除订单列表缓存
...
...
@@ -785,7 +785,7 @@ class OrderModel extends \DAO\AbstractModel
}
//删除订单缓存
public
function
deleteOrderCache
(
$memberId
,
$orderId
=
false
,
$stroeId
=
false
,
$deleteGetShopKeeperCountByStoreId
=
false
,
$deleteGetFavoritesCountByStoreId
=
false
)
public
function
deleteOrderCache
(
$memberId
,
$orderId
=
false
,
$stroeId
=
false
,
$deleteGetShopKeeperCountByStoreId
=
false
,
$deleteGetFavoritesCountByStoreId
=
false
,
$diliverymanId
)
{
if
(
!
empty
(
$memberId
))
{
$this
->
deleteGetListByMemberId
(
$memberId
);
...
...
@@ -808,6 +808,9 @@ class OrderModel extends \DAO\AbstractModel
$favoritesStoreDao
->
deleteGetFavoritesCountByStoreId
(
$stroeId
);
}
}
if
(
!
empty
(
$diliverymanId
)){
$this
->
deleteGetListByMemberId
(
$memberId
);
}
return
true
;
}
...
...
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